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

Commit

Permalink
importing angular without reassigning angular variable
Browse files Browse the repository at this point in the history
  • Loading branch information
jonshaffer committed Jan 10, 2017
1 parent 82aba07 commit 41d223d
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 16 deletions.
1 change: 0 additions & 1 deletion config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ System.config({
'github:*': 'jspm_packages/github/*',
'npm:*': 'jspm_packages/npm/*',
},

map: {
angular: 'npm:[email protected]',
babel: 'npm:[email protected]',
Expand Down
1 change: 1 addition & 0 deletions gulpfile.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ gulp.task('serve', ['compile'], (callback) => {

gulp.task('watch', ['serve'], () => {
const watcher = gulp.watch([path.source, path.less, '*.html'], ['compile']);

watcher.on('change', (event) => {
gutils.log(`File ${event.path} was ${event.type}, running tasks...`);
});
Expand Down
4 changes: 4 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/* eslint-disable */
require('babel-core/register');

require('./gulpfile.babel.js');
4 changes: 2 additions & 2 deletions release/dataTable.cjs.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions release/dataTable.es6.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import angular$1 from 'angular';
import 'angular';

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

Expand Down Expand Up @@ -3698,7 +3698,7 @@ function PositionHelper($log) {
};
}

var popover = angular$1
var popover = angular
.module('dt.popover', [])
.factory('PopoverRegistry', PopoverRegistry)
.factory('PositionHelper', PositionHelper)
Expand Down Expand Up @@ -3864,12 +3864,12 @@ var dropdown = angular
.directive('dropdownToggle', DropdownToggleDirective)
.directive('dropdownMenu', DropdownMenuDirective);

var menu = angular$1
var menu = angular
.module('dt.menu', [dropdown.name])
.controller('MenuController', MenuController)
.directive('dtm', MenuDirective);

var dataTable = angular$1
var dataTable = angular
.module('data-table', [])
.directive('dtable', DataTableDirective)
.directive('resizable', ResizableDirective)
Expand Down
4 changes: 2 additions & 2 deletions release/dataTable.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions release/dataTable.min.js

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions src/components/menu/menu.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import angular from 'angular';

import MenuController from './MenuController';
import MenuDirective from './MenuDirective';

Expand Down
2 changes: 0 additions & 2 deletions src/components/popover/popover.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import angular from 'angular';

import PopoverDirective from './PopoverDirective';
import PopoverRegistry from './PopoverRegistry';
import PositionHelper from './PositionHelper';
Expand Down
2 changes: 1 addition & 1 deletion src/dataTable.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import angular from 'angular';
import 'angular';

import './utils/polyfill';

Expand Down

0 comments on commit 41d223d

Please sign in to comment.