shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Code Releases Activity

Merge pull request #1577 from jaredevantabor/network-dep-cleanup

Browse Source 
Removes dupclicate Angular import
This commit is contained in:
Jared Tabor 2018-04-26 14:36:42 -07:00 committed by GitHub
commit 1b013eb2e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/app.js
View File

@ -43,7 +43,7 @@ import atLibComponents from '~components';
import atLibModels from '~models'; import atLibModels from '~models';
import atLibServices from '~services'; import atLibServices from '~services';
import networkUI from '~network-ui/main'; import networkUI from '~network-ui/network.ui.app';
start.bootstrap(() => { start.bootstrap(() => {
angular.bootstrap(document.body, ['awApp']); angular.bootstrap(document.body, ['awApp']);
@ -91,7 +91,7 @@ angular
users.name, users.name,
projects.name, projects.name,
scheduler.name, scheduler.name,
networkUI.tower.name, networkUI.name,
'Utilities', 'Utilities',
'templates', 'templates',

5
awx/ui/client/src/network-ui/main.js
View File

@ -1,5 +0,0 @@
/* Copyright (c) 2017 Red Hat, Inc. */
var networkUI = require('./network.ui.app.js');
var tower = require('./tower.app.js');
exports.networkUI = networkUI.networkUI;
exports.tower = tower.tower;

6
awx/ui/client/src/network-ui/network.ui.app.js
View File

@ -5,7 +5,6 @@ import networkDetailsDirective from './network-details/main';
import networkZoomWidget from './zoom-widget/main'; import networkZoomWidget from './zoom-widget/main';
//console.log = function () { }; //console.log = function () { };
var angular = require('angular');
var NetworkUIController = require('./network.ui.controller.js'); var NetworkUIController = require('./network.ui.controller.js');
var cursor = require('./cursor.directive.js'); var cursor = require('./cursor.directive.js');
var router = require('./router.directive.js'); var router = require('./router.directive.js');
@ -21,7 +20,8 @@ var debug = require('./debug.directive.js');
var test_results = require('./test_results.directive.js'); var test_results = require('./test_results.directive.js');
var awxNetworkUI = require('./network.ui.directive.js'); var awxNetworkUI = require('./network.ui.directive.js');
var networkUI = angular.module('networkUI', [ export default
angular.module('networkUI', [
'monospaced.mousewheel', 'monospaced.mousewheel',
atFeaturesNetworking, atFeaturesNetworking,
networkDetailsDirective.name, networkDetailsDirective.name,
@ -41,5 +41,3 @@ var networkUI = angular.module('networkUI', [
.directive('awxNetInventoryToolbox', inventoryToolbox.inventoryToolbox) .directive('awxNetInventoryToolbox', inventoryToolbox.inventoryToolbox)
.directive('awxNetTestResults', test_results.test_results) .directive('awxNetTestResults', test_results.test_results)
.directive('awxNetworkUi', awxNetworkUI.awxNetworkUI); .directive('awxNetworkUi', awxNetworkUI.awxNetworkUI);
exports.networkUI = networkUI;

1
awx/ui/client/src/network-ui/network.ui.controller.js
View File

@ -1,5 +1,4 @@
/* Copyright (c) 2017 Red Hat, Inc. */ /* Copyright (c) 2017 Red Hat, Inc. */
var angular = require('angular');
var fsm = require('./fsm.js'); var fsm = require('./fsm.js');
var mode_fsm = require('./mode.fsm.js'); var mode_fsm = require('./mode.fsm.js');
var hotkeys = require('./hotkeys.fsm.js'); var hotkeys = require('./hotkeys.fsm.js');

8
awx/ui/client/src/network-ui/tower.app.js
View File

@ -1,8 +0,0 @@
/* Copyright (c) 2017 Red Hat, Inc. */
var angular = require('angular');
var tower = angular.module('tower', ['networkUI', 'ui.router']);
exports.tower = tower;