External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 11:00:03 -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
commit a4e60b711f
2 changed files with 12 additions and 9 deletions
Show Stats 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 configuration from './configuration/main';
import home from './home/main';
import moment from './shared/moment/main';
import login from './login/main';
import activityStream from './activity-stream/main';
import standardOut from './standard-out/main';
@ -68,14 +67,8 @@ import jobs from './jobs/main';
import teams from './teams/main';
import users from './users/main';
import projects from './projects/main';
import RestServices from './rest/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 footer from './footer/main';
import scheduler from './scheduler/main';
@ -114,7 +107,6 @@ var tower = angular.module('Tower', [
mainMenu.name,
breadCrumb.name,
home.name,
moment.name,
login.name,
activityStream.name,
footer.name,
@ -125,7 +117,6 @@ var tower = angular.module('Tower', [
standardOut.name,
Templates.name,
portalMode.name,
config.name,
credentials.name,
jobs.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 loadconfig from './load-config/main';
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';
export default
@ -44,6 +50,12 @@ angular.module('shared', [listGenerator.name,
parse.name,
loadconfig.name,
Modal.name,
moment.name,
config.name,
PromptDialog.name,
directives.name,
filters.name,
features.name,
require('angular-cookies'),
'angular-duration-format'
])