Commit 4d19a5d3 authored by Pascal Hartig's avatar Pascal Hartig

AngularJS: Upgrade to 1.2.10

Only upgraded main example. Let's not go nuts and upgrade all of them for every
patch release.
parent 8aeedf79
......@@ -2,11 +2,11 @@
"name": "todomvc-angular",
"version": "0.0.0",
"dependencies": {
"angular": "1.2.8",
"angular": "1.2.10",
"todomvc-common": "~0.1.4"
},
"devDependencies": {
"angular-mocks": "1.2.8",
"angular-route": "1.2.8"
"angular-mocks": "1.2.10",
"angular-route": "1.2.10"
}
}
/**
* @license AngularJS v1.2.8
* @license AngularJS v1.2.10
* (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT
*/
......@@ -190,7 +190,7 @@ function $RouteProvider(){
path = path
.replace(/([().])/g, '\\$1')
.replace(/(\/)?:(\w+)([\?|\*])?/g, function(_, slash, key, option){
.replace(/(\/)?:(\w+)([\?\*])?/g, function(_, slash, key, option){
var optional = option === '?' ? option : null;
var star = option === '*' ? option : null;
keys.push({ name: key, optional: !!optional });
......@@ -375,7 +375,7 @@ function $RouteProvider(){
* @eventType broadcast on root scope
* @description
* Broadcasted before a route change. At this point the route services starts
* resolving all of the dependencies needed for the route change to occurs.
* resolving all of the dependencies needed for the route change to occur.
* Typically this involves fetching the view template as well as any dependencies
* defined in `resolve` route property. Once all of the dependencies are resolved
* `$routeChangeSuccess` is fired.
......@@ -669,6 +669,15 @@ ngRouteModule.directive('ngView', ngViewFillContentFactory);
*
* @scope
* @priority 400
* @param {string=} onload Expression to evaluate whenever the view updates.
*
* @param {string=} autoscroll Whether `ngView` should call {@link ng.$anchorScroll
* $anchorScroll} to scroll the viewport after the view is updated.
*
* - If the attribute is not set, disable scrolling.
* - If the attribute is set without value, enable scrolling.
* - Otherwise enable scrolling only if the `autoscroll` attribute value evaluated
* as an expression yields a truthy value.
* @example
<example module="ngViewExample" deps="angular-route.js" animations="true">
<file name="index.html">
......
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