diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index a102924ea4..834439bcf9 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -31,7 +31,7 @@ import systemTracking from './system-tracking/main'; import inventoryScripts from './inventory-scripts/main'; import permissions from './permissions/main'; import managementJobs from './management-jobs/main'; -import routeExtensions from './shared/route-extensions/main'; +// import routeExtensions from './shared/route-extensions/main'; import breadcrumbs from './shared/breadcrumbs/main'; @@ -70,7 +70,6 @@ import './job-templates/main'; import './shared/features/main'; import './login/authenticationServices/pendo/ng-pendo'; import footer from './footer/main'; -import uiRouterHelper from './shared/uiRouterHelper/main'; /*#if DEBUG#*/ import {__deferLoadIfEnabled} from './debug'; @@ -189,7 +188,6 @@ var tower = angular.module('Tower', [ 'pendolytics', 'ui.router', 'ncy-angular-breadcrumb', - uiRouterHelper.name ]) .constant('AngularScheduler.partials', urlPrefix + 'lib/angular-scheduler/lib/') @@ -207,7 +205,7 @@ var tower = angular.module('Tower', [ }); // $urlRouterProvider.otherwise("/home"); - $urlRouterProvider.otherwise(function($injector, $location){ + $urlRouterProvider.otherwise(function($injector){ var $state = $injector.get("$state"); $state.go('dashboard'); }); diff --git a/awx/ui/client/src/setup-menu/main.js b/awx/ui/client/src/setup-menu/main.js index 5be77b25f5..cf8755b7c5 100644 --- a/awx/ui/client/src/setup-menu/main.js +++ b/awx/ui/client/src/setup-menu/main.js @@ -7,9 +7,5 @@ export default icon.name ]) .run(['$stateExtender', function($stateExtender) { - // var// $stateProvider = $injector.get("$state"), - // state = route.name; - // delete route.name; - $stateExtender.addState(route); }]); diff --git a/awx/ui/client/src/shared/main.js b/awx/ui/client/src/shared/main.js index 357cd73b09..8996a1bca1 100644 --- a/awx/ui/client/src/shared/main.js +++ b/awx/ui/client/src/shared/main.js @@ -9,12 +9,15 @@ import title from './title.directive'; import lodashAsPromised from './lodash-as-promised'; import stringFilters from './string-filters/main'; import truncatedText from './truncated-text.directive'; +import stateExtender from './stateExtender.provider'; export default angular.module('shared', [ listGenerator.name, - stringFilters.name + stringFilters.name, + 'ui.router' ]) .factory('lodashAsPromised', lodashAsPromised) .directive('truncatedText', truncatedText) - .directive('title', title); + .directive('title', title) + .provider('$stateExtender', stateExtender); diff --git a/awx/ui/client/src/shared/stateExtender.provider.js b/awx/ui/client/src/shared/stateExtender.provider.js new file mode 100644 index 0000000000..13c6605759 --- /dev/null +++ b/awx/ui/client/src/shared/stateExtender.provider.js @@ -0,0 +1,15 @@ + +export default function($stateProvider){ + this.$get = function(){ + return { + addState: function(state) { + $stateProvider.state(state.name , { + url: state.route, + controller: state.controller, + templateUrl: state.templateUrl, + resolve: state.resolve + }); + } + }; + }; +} diff --git a/awx/ui/client/src/shared/uiRouterHelper/main.js b/awx/ui/client/src/shared/uiRouterHelper/main.js deleted file mode 100644 index bf28220701..0000000000 --- a/awx/ui/client/src/shared/uiRouterHelper/main.js +++ /dev/null @@ -1,21 +0,0 @@ - -export default angular.module('uiRouterHelper',[ - - ]) - - .provider('$stateExtender', function($stateProvider){ - this.$get = function($state){ - return { - addState: function(state) { - $stateProvider.state(state.name , { - url: state.route, - controller: state.controller, - templateUrl: state.templateUrl, - resolve: state.resolve - }); - - - } - } - } - });