From 07139820cb2c70e85ec31e8753d7aff776c59818 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Mon, 2 Oct 2017 11:41:43 -0400 Subject: [PATCH] updating angular-ui-router to v. 1.0.7 --- awx/ui/build/webpack.base.js | 2 -- awx/ui/client/src/app.js | 2 -- awx/ui/client/src/configuration/configuration.route.js | 1 - awx/ui/client/src/scheduler/main.js | 2 -- awx/ui/client/src/vendor.js | 3 +-- awx/ui/package.json | 2 +- 6 files changed, 2 insertions(+), 10 deletions(-) diff --git a/awx/ui/build/webpack.base.js b/awx/ui/build/webpack.base.js index 371a6934aa..e7e5d54676 100644 --- a/awx/ui/build/webpack.base.js +++ b/awx/ui/build/webpack.base.js @@ -195,8 +195,6 @@ const base = { 'js-yaml$': '~node_modules/js-yaml/dist/js-yaml.min.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-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-directives$': '~node_modules/ng-toast/src/scripts/directives.js', 'ng-toast$': '~node_modules/ng-toast/src/scripts/module.js' diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index 2bc604d328..fcb1457adf 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -71,8 +71,6 @@ angular 'ngToast', 'gettext', 'Timezones', - 'ui.router', - 'ui.router.state.events', 'lrInfiniteScroll', about.name, diff --git a/awx/ui/client/src/configuration/configuration.route.js b/awx/ui/client/src/configuration/configuration.route.js index 8f9537c84f..c916ecf59d 100644 --- a/awx/ui/client/src/configuration/configuration.route.js +++ b/awx/ui/client/src/configuration/configuration.route.js @@ -28,7 +28,6 @@ ncyBreadcrumb: { label: N_("EDIT CONFIGURATION") }, - controller: ConfigurationController, resolve: { configDataResolve: ['ConfigurationService', function(ConfigurationService){ return ConfigurationService.getConfigurationOptions(); diff --git a/awx/ui/client/src/scheduler/main.js b/awx/ui/client/src/scheduler/main.js index 34cb3cd5cb..3c72575373 100644 --- a/awx/ui/client/src/scheduler/main.js +++ b/awx/ui/client/src/scheduler/main.js @@ -133,8 +133,6 @@ export default searchPrefix: 'schedule', name: 'workflowJobTemplateSchedules', route: '/templates/workflow_job_template/:id/schedules', - templateUrl: templateUrl("scheduler/scheduler"), - controller: 'schedulerController', data: { activityStream: true, activityStreamTarget: 'job_template', diff --git a/awx/ui/client/src/vendor.js b/awx/ui/client/src/vendor.js index 89e148e7e2..0be729317d 100644 --- a/awx/ui/client/src/vendor.js +++ b/awx/ui/client/src/vendor.js @@ -46,8 +46,7 @@ require('angular-md5'); require('angular-moment'); require('angular-scheduler'); require('angular-tz-extensions'); -require('angular-ui-router'); -require('angular-ui-router-state-events'); +require('@uirouter/angularjs'); require('ng-toast-provider'); require('ng-toast-directives'); require('ng-toast'); diff --git a/awx/ui/package.json b/awx/ui/package.json index 2f81d84a18..971f206e15 100644 --- a/awx/ui/package.json +++ b/awx/ui/package.json @@ -91,6 +91,7 @@ "webpack-merge": "^4.1.0" }, "dependencies": { + "@uirouter/angularjs": "^1.0.7", "angular": "~1.4.14", "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", @@ -104,7 +105,6 @@ "angular-sanitize": "~1.4.14", "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-ui-router": "1.0.0-beta.3", "babel-polyfill": "^6.26.0", "bootstrap": "^3.3.7", "bootstrap-datepicker": "^1.7.1",