Commit a1e91120 authored by Pascal Hartig's avatar Pascal Hartig

AngularJS: Upgrade to 1.3.4

parent 83d21c67
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
"name": "todomvc-angular", "name": "todomvc-angular",
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "dependencies": {
"angular": "1.3.3", "angular": "1.3.4",
"todomvc-common": "~0.3.0" "todomvc-common": "~0.3.0"
}, },
"devDependencies": { "devDependencies": {
"angular-mocks": "1.3.3", "angular-mocks": "1.3.4",
"angular-route": "1.3.3" "angular-route": "1.3.4"
} }
} }
/** /**
* @license AngularJS v1.3.3 * @license AngularJS v1.3.4
* (c) 2010-2014 Google, Inc. http://angularjs.org * (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT * License: MIT
*/ */
...@@ -41,7 +41,7 @@ var ngRouteModule = angular.module('ngRoute', ['ng']). ...@@ -41,7 +41,7 @@ var ngRouteModule = angular.module('ngRoute', ['ng']).
*/ */
function $RouteProvider() { function $RouteProvider() {
function inherit(parent, extra) { function inherit(parent, extra) {
return angular.extend(new (angular.extend(function() {}, {prototype:parent}))(), extra); return angular.extend(Object.create(parent), extra);
} }
var routes = {}; var routes = {};
...@@ -657,7 +657,7 @@ function $RouteProvider() { ...@@ -657,7 +657,7 @@ function $RouteProvider() {
if (i === 0) { if (i === 0) {
result.push(segment); result.push(segment);
} else { } else {
var segmentMatch = segment.match(/(\w+)(.*)/); var segmentMatch = segment.match(/(\w+)(?:[?*])?(.*)/);
var key = segmentMatch[1]; var key = segmentMatch[1];
result.push(params[key]); result.push(params[key]);
result.push(segmentMatch[2] || ''); result.push(segmentMatch[2] || '');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment