jshint fixes

This commit is contained in:
Joe Fiorini
2015-05-13 09:36:31 -04:00
parent 9d1d8374e1
commit 8828ca089e
4 changed files with 17 additions and 18 deletions

View File

@@ -57,7 +57,7 @@ export default
routeName: '@route', routeName: '@route',
model: '&' model: '&'
}, },
link: function(scope, element, attrs) { link: function(scope, element) {
var model = scope.$eval(scope.model); var model = scope.$eval(scope.model);
scope.url = lookupRouteUrl(scope.routeName, $routeProvider.routes, model); scope.url = lookupRouteUrl(scope.routeName, $routeProvider.routes, model);
@@ -71,4 +71,4 @@ export default
} }
}; };
} }
] ];

View File

@@ -25,7 +25,7 @@ export function lookupRouteUrl(name, routes, models) {
value = _.pluck(model, 'id'); value = _.pluck(model, 'id');
} }
value = value.join(',') value = value.join(',');
} else if (angular.isObject(model)) { } else if (angular.isObject(model)) {
value = model[key]; value = model[key];

View File

@@ -2,17 +2,16 @@ export default
[ '$rootScope', [ '$rootScope',
'$routeParams', '$routeParams',
function($rootScope, $routeParams) { function($rootScope, $routeParams) {
var offRouteChangeStart = $rootScope.$on('$routeChangeSuccess', function(e, newRoute) {
$rootScope.$on('$routeChangeSuccess', function(e, newRoute) { if (angular.isUndefined(newRoute.model)) {
if (angular.isUndefined(newRoute.model)) { var keys = Object.keys(newRoute.params);
var keys = Object.keys(newRoute.params); var models = keys.reduce(function(model, key) {
var models = keys.reduce(function(model, key) { model[key] = newRoute.locals[key];
model[key] = newRoute.locals[key]; return model;
return model; }, {});
}, {});
$routeParams.model = models; $routeParams.model = models;
} }
}); });
} }
] ];

View File

@@ -113,7 +113,7 @@ export default
}); });
var offRouteChangeError = var offRouteChangeError =
$rootScope.$on('$routeChangeError', function(e, newRoute, prevRoute, rejection) { $rootScope.$on('$routeChangeError', function(e, newRoute, previousRoute, rejection) {
if (newRoute.$$route.name === routeName) { if (newRoute.$$route.name === routeName) {
deferred.reject(newRoute, previousRoute, rejection); deferred.reject(newRoute, previousRoute, rejection);
} }
@@ -126,6 +126,6 @@ export default
}, $rootScope); }, $rootScope);
return deferred; return deferred;
} };
} }
] ];