From 8828ca089e568c63dc6aed0c4443627ee278e13c Mon Sep 17 00:00:00 2001 From: Joe Fiorini Date: Wed, 13 May 2015 09:36:31 -0400 Subject: [PATCH] jshint fixes --- .../route-extensions/link-to.directive.js | 4 ++-- .../route-extensions/lookup-route-url.js | 2 +- .../route-extensions/model-listener.config.js | 23 +++++++++---------- .../route-extensions/transition-to.factory.js | 6 ++--- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/awx/ui/static/js/shared/route-extensions/link-to.directive.js b/awx/ui/static/js/shared/route-extensions/link-to.directive.js index 77d0e31f04..b79ffaef99 100644 --- a/awx/ui/static/js/shared/route-extensions/link-to.directive.js +++ b/awx/ui/static/js/shared/route-extensions/link-to.directive.js @@ -57,7 +57,7 @@ export default routeName: '@route', model: '&' }, - link: function(scope, element, attrs) { + link: function(scope, element) { var model = scope.$eval(scope.model); scope.url = lookupRouteUrl(scope.routeName, $routeProvider.routes, model); @@ -71,4 +71,4 @@ export default } }; } - ] + ]; diff --git a/awx/ui/static/js/shared/route-extensions/lookup-route-url.js b/awx/ui/static/js/shared/route-extensions/lookup-route-url.js index 7b9c6cc50d..54e505a2ae 100644 --- a/awx/ui/static/js/shared/route-extensions/lookup-route-url.js +++ b/awx/ui/static/js/shared/route-extensions/lookup-route-url.js @@ -25,7 +25,7 @@ export function lookupRouteUrl(name, routes, models) { value = _.pluck(model, 'id'); } - value = value.join(',') + value = value.join(','); } else if (angular.isObject(model)) { value = model[key]; diff --git a/awx/ui/static/js/shared/route-extensions/model-listener.config.js b/awx/ui/static/js/shared/route-extensions/model-listener.config.js index d1b0b22357..7f7112f08a 100644 --- a/awx/ui/static/js/shared/route-extensions/model-listener.config.js +++ b/awx/ui/static/js/shared/route-extensions/model-listener.config.js @@ -2,17 +2,16 @@ export default [ '$rootScope', '$routeParams', function($rootScope, $routeParams) { - var offRouteChangeStart = - $rootScope.$on('$routeChangeSuccess', function(e, newRoute) { - if (angular.isUndefined(newRoute.model)) { - var keys = Object.keys(newRoute.params); - var models = keys.reduce(function(model, key) { - model[key] = newRoute.locals[key]; - return model; - }, {}); + $rootScope.$on('$routeChangeSuccess', function(e, newRoute) { + if (angular.isUndefined(newRoute.model)) { + var keys = Object.keys(newRoute.params); + var models = keys.reduce(function(model, key) { + model[key] = newRoute.locals[key]; + return model; + }, {}); - $routeParams.model = models; - } - }); + $routeParams.model = models; + } + }); } - ] + ]; diff --git a/awx/ui/static/js/shared/route-extensions/transition-to.factory.js b/awx/ui/static/js/shared/route-extensions/transition-to.factory.js index 71e68216ad..6acee4326f 100644 --- a/awx/ui/static/js/shared/route-extensions/transition-to.factory.js +++ b/awx/ui/static/js/shared/route-extensions/transition-to.factory.js @@ -113,7 +113,7 @@ export default }); var offRouteChangeError = - $rootScope.$on('$routeChangeError', function(e, newRoute, prevRoute, rejection) { + $rootScope.$on('$routeChangeError', function(e, newRoute, previousRoute, rejection) { if (newRoute.$$route.name === routeName) { deferred.reject(newRoute, previousRoute, rejection); } @@ -126,6 +126,6 @@ export default }, $rootScope); return deferred; - } + }; } - ] + ];