diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2015-01-27 09:23:03 +0100 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2015-01-27 09:23:03 +0100 |
| commit | be37aed9f5d923fe16e264c6ffc97db08503b791 (patch) | |
| tree | 9ab5442c37240da881c2308290f2f5425003ba92 /js/vendor/angular-route/angular-route.js | |
| parent | 1bc1507dd4d92c841e9a56c7d4c241dd7fa1c25f (diff) | |
more clientside updates (angular 1.4 beta, es6-shim, momentjs
Diffstat (limited to 'js/vendor/angular-route/angular-route.js')
| -rw-r--r-- | js/vendor/angular-route/angular-route.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/vendor/angular-route/angular-route.js b/js/vendor/angular-route/angular-route.js index 90eb632be..849383a38 100644 --- a/js/vendor/angular-route/angular-route.js +++ b/js/vendor/angular-route/angular-route.js @@ -1,6 +1,6 @@ /** - * @license AngularJS v1.3.11 - * (c) 2010-2014 Google, Inc. http://angularjs.org + * @license AngularJS v1.4.0-build.3807+sha.b3a9bd3 + * (c) 2010-2015 Google, Inc. http://angularjs.org * License: MIT */ (function(window, angular, undefined) {'use strict'; @@ -612,8 +612,8 @@ function $RouteProvider() { return $q.all(locals); } }). - // after route change then(function(locals) { + // after route change if (nextRoute == $route.current) { if (nextRoute) { nextRoute.locals = locals; |