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

updating angular-ui-router to v. 1.0.7

Browse Source
This commit is contained in:
Jared Tabor
2017-10-02 11:41:43 -04:00
parent 764356bf47
commit 07139820cb
6 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/build/webpack.base.js
View File

@@ -195,8 +195,6 @@ const base = {
'js-yaml$': '~node_modules/js-yaml/dist/js-yaml.min.js', 'js-yaml$': '~node_modules/js-yaml/dist/js-yaml.min.js',
'lr-infinite-scroll$': '~node_modules/lr-infinite-scroll/lrInfiniteScroll.js', 'lr-infinite-scroll$': '~node_modules/lr-infinite-scroll/lrInfiniteScroll.js',
'angular-tz-extensions$': '~node_modules/angular-tz-extensions/lib/angular-tz-extensions.js', 'angular-tz-extensions$': '~node_modules/angular-tz-extensions/lib/angular-tz-extensions.js',
'angular-ui-router$': '~node_modules/angular-ui-router/release/angular-ui-router.js',
'angular-ui-router-state-events$': '~node_modules/angular-ui-router/release/stateEvents.js',
'ng-toast-provider$': '~node_modules/ng-toast/src/scripts/provider.js', 'ng-toast-provider$': '~node_modules/ng-toast/src/scripts/provider.js',
'ng-toast-directives$': '~node_modules/ng-toast/src/scripts/directives.js', 'ng-toast-directives$': '~node_modules/ng-toast/src/scripts/directives.js',
'ng-toast$': '~node_modules/ng-toast/src/scripts/module.js' 'ng-toast$': '~node_modules/ng-toast/src/scripts/module.js'

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

@@ -71,8 +71,6 @@ angular
'ngToast', 'ngToast',
'gettext', 'gettext',
'Timezones', 'Timezones',
'ui.router',
'ui.router.state.events',
'lrInfiniteScroll', 'lrInfiniteScroll',
about.name, about.name,

1
awx/ui/client/src/configuration/configuration.route.js
View File

@@ -28,7 +28,6 @@
ncyBreadcrumb: { ncyBreadcrumb: {
label: N_("EDIT CONFIGURATION") label: N_("EDIT CONFIGURATION")
}, },
controller: ConfigurationController,
resolve: { resolve: {
configDataResolve: ['ConfigurationService', function(ConfigurationService){ configDataResolve: ['ConfigurationService', function(ConfigurationService){
return ConfigurationService.getConfigurationOptions(); return ConfigurationService.getConfigurationOptions();

2
awx/ui/client/src/scheduler/main.js
View File

@@ -133,8 +133,6 @@ export default
searchPrefix: 'schedule', searchPrefix: 'schedule',
name: 'workflowJobTemplateSchedules', name: 'workflowJobTemplateSchedules',
route: '/templates/workflow_job_template/:id/schedules', route: '/templates/workflow_job_template/:id/schedules',
templateUrl: templateUrl("scheduler/scheduler"),
controller: 'schedulerController',
data: { data: {
activityStream: true, activityStream: true,
activityStreamTarget: 'job_template', activityStreamTarget: 'job_template',

3
awx/ui/client/src/vendor.js
View File

@@ -46,8 +46,7 @@ require('angular-md5');
require('angular-moment'); require('angular-moment');
require('angular-scheduler'); require('angular-scheduler');
require('angular-tz-extensions'); require('angular-tz-extensions');
require('angular-ui-router'); require('@uirouter/angularjs');
require('angular-ui-router-state-events');
require('ng-toast-provider'); require('ng-toast-provider');
require('ng-toast-directives'); require('ng-toast-directives');
require('ng-toast'); require('ng-toast');

2
awx/ui/package.json
View File

@@ -91,6 +91,7 @@
"webpack-merge": "^4.1.0" "webpack-merge": "^4.1.0"
}, },
"dependencies": { "dependencies": {
"@uirouter/angularjs": "^1.0.7",
"angular": "~1.4.14", "angular": "~1.4.14",
"angular-breadcrumb": "git+https://git@github.com/ansible/angular-breadcrumb#0.4.1", "angular-breadcrumb": "git+https://git@github.com/ansible/angular-breadcrumb#0.4.1",
"angular-codemirror": "git+https://git@github.com/ansible/angular-codemirror#1.0.4", "angular-codemirror": "git+https://git@github.com/ansible/angular-codemirror#1.0.4",
@@ -104,7 +105,6 @@
"angular-sanitize": "~1.4.14", "angular-sanitize": "~1.4.14",
"angular-scheduler": "git+https://git@github.com/ansible/angular-scheduler#0.1.1", "angular-scheduler": "git+https://git@github.com/ansible/angular-scheduler#0.1.1",
"angular-tz-extensions": "git+https://git@github.com/ansible/angular-tz-extensions#0.3.13", "angular-tz-extensions": "git+https://git@github.com/ansible/angular-tz-extensions#0.3.13",
"angular-ui-router": "1.0.0-beta.3",
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",
"bootstrap": "^3.3.7", "bootstrap": "^3.3.7",
"bootstrap-datepicker": "^1.7.1", "bootstrap-datepicker": "^1.7.1",