diff options
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 9c09fff5a..682031878 100644 --- a/js/vendor/angular-route/angular-route.js +++ b/js/vendor/angular-route/angular-route.js @@ -1,5 +1,5 @@ /** - * @license AngularJS v1.3.3 + * @license AngularJS v1.3.4 * (c) 2010-2014 Google, Inc. http://angularjs.org * License: MIT */ @@ -41,7 +41,7 @@ var ngRouteModule = angular.module('ngRoute', ['ng']). */ function $RouteProvider() { function inherit(parent, extra) { - return angular.extend(new (angular.extend(function() {}, {prototype:parent}))(), extra); + return angular.extend(Object.create(parent), extra); } var routes = {}; @@ -657,7 +657,7 @@ function $RouteProvider() { if (i === 0) { result.push(segment); } else { - var segmentMatch = segment.match(/(\w+)(.*)/); + var segmentMatch = segment.match(/(\w+)(?:[?*])?(.*)/); var key = segmentMatch[1]; result.push(params[key]); result.push(segmentMatch[2] || ''); |