External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-05 10:41:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5610 from mabashian/shared-appjs

Browse Source 
Import shared modules in shared/main.js rather than app.js
This commit is contained in:
Michael Abashian
2017-03-02 15:49:12 -05:00
committed by GitHub
parent 0d2f16d34d 956beba290
commit a4e60b711f
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,6 @@ import breadCrumb from './bread-crumb/main';
import browserData from './browser-data/main'; import browserData from './browser-data/main';
import configuration from './configuration/main'; import configuration from './configuration/main';
import home from './home/main'; import home from './home/main';
import moment from './shared/moment/main';
import login from './login/main'; import login from './login/main';
import activityStream from './activity-stream/main'; import activityStream from './activity-stream/main';
import standardOut from './standard-out/main'; import standardOut from './standard-out/main';
@@ -68,14 +67,8 @@ import jobs from './jobs/main';
import teams from './teams/main'; import teams from './teams/main';
import users from './users/main'; import users from './users/main';
import projects from './projects/main'; import projects from './projects/main';
import RestServices from './rest/main'; import RestServices from './rest/main';
import access from './access/main'; import access from './access/main';
import './shared/prompt-dialog';
import './shared/directives';
import './shared/filters';
import './shared/features/main';
import config from './shared/config/main';
import './login/authenticationServices/pendo/ng-pendo'; import './login/authenticationServices/pendo/ng-pendo';
import footer from './footer/main'; import footer from './footer/main';
import scheduler from './scheduler/main'; import scheduler from './scheduler/main';
@@ -114,7 +107,6 @@ var tower = angular.module('Tower', [
mainMenu.name, mainMenu.name,
breadCrumb.name, breadCrumb.name,
home.name, home.name,
moment.name,
login.name, login.name,
activityStream.name, activityStream.name,
footer.name, footer.name,
@@ -125,7 +117,6 @@ var tower = angular.module('Tower', [
standardOut.name, standardOut.name,
Templates.name, Templates.name,
portalMode.name, portalMode.name,
config.name,
credentials.name, credentials.name,
jobs.name, jobs.name,
teams.name, teams.name,

12
awx/ui/client/src/shared/main.js
View File

@@ -24,6 +24,12 @@ import variables from './variables/main';
import parse from './parse/main'; import parse from './parse/main';
import loadconfig from './load-config/main'; import loadconfig from './load-config/main';
import Modal from './Modal'; import Modal from './Modal';
import moment from './moment/main';
import config from './config/main';
import PromptDialog from './prompt-dialog';
import directives from './directives';
import filters from './filters';
import features from './features/main';
import 'angular-duration-format'; import 'angular-duration-format';
export default export default
@@ -44,6 +50,12 @@ angular.module('shared', [listGenerator.name,
parse.name, parse.name,
loadconfig.name, loadconfig.name,
Modal.name, Modal.name,
moment.name,
config.name,
PromptDialog.name,
directives.name,
filters.name,
features.name,
require('angular-cookies'), require('angular-cookies'),
'angular-duration-format' 'angular-duration-format'
]) ])