Skip to content
This repository was archived by the owner on Jan 7, 2022. It is now read-only.

Commit 41d223d

Browse files
committed
importing angular without reassigning angular variable
1 parent 82aba07 commit 41d223d

File tree

10 files changed

+16
-16
lines changed

10 files changed

+16
-16
lines changed

config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ System.config({
1414
'github:*': 'jspm_packages/github/*',
1515
'npm:*': 'jspm_packages/npm/*',
1616
},
17-
1817
map: {
1918
angular: 'npm:[email protected]',
2019
babel: 'npm:[email protected]',

gulpfile.babel.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ gulp.task('serve', ['compile'], (callback) => {
8383

8484
gulp.task('watch', ['serve'], () => {
8585
const watcher = gulp.watch([path.source, path.less, '*.html'], ['compile']);
86+
8687
watcher.on('change', (event) => {
8788
gutils.log(`File ${event.path} was ${event.type}, running tasks...`);
8889
});

gulpfile.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/* eslint-disable */
2+
require('babel-core/register');
3+
4+
require('./gulpfile.babel.js');

release/dataTable.cjs.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release/dataTable.es6.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import angular$1 from 'angular';
1+
import 'angular';
22

33
/* eslint-disable no-extend-native, no-bitwise */
44

@@ -3698,7 +3698,7 @@ function PositionHelper($log) {
36983698
};
36993699
}
37003700

3701-
var popover = angular$1
3701+
var popover = angular
37023702
.module('dt.popover', [])
37033703
.factory('PopoverRegistry', PopoverRegistry)
37043704
.factory('PositionHelper', PositionHelper)
@@ -3864,12 +3864,12 @@ var dropdown = angular
38643864
.directive('dropdownToggle', DropdownToggleDirective)
38653865
.directive('dropdownMenu', DropdownMenuDirective);
38663866

3867-
var menu = angular$1
3867+
var menu = angular
38683868
.module('dt.menu', [dropdown.name])
38693869
.controller('MenuController', MenuController)
38703870
.directive('dtm', MenuDirective);
38713871

3872-
var dataTable = angular$1
3872+
var dataTable = angular
38733873
.module('data-table', [])
38743874
.directive('dtable', DataTableDirective)
38753875
.directive('resizable', ResizableDirective)

release/dataTable.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release/dataTable.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/menu/menu.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import angular from 'angular';
2-
31
import MenuController from './MenuController';
42
import MenuDirective from './MenuDirective';
53

src/components/popover/popover.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import angular from 'angular';
2-
31
import PopoverDirective from './PopoverDirective';
42
import PopoverRegistry from './PopoverRegistry';
53
import PositionHelper from './PositionHelper';

src/dataTable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import angular from 'angular';
1+
import 'angular';
22

33
import './utils/polyfill';
44

0 commit comments

Comments
 (0)