Commit d0b1f342 authored by Pascal Hartig's avatar Pascal Hartig

Angular: Upgrade all apps to 1.2.8

parent dcb5be3b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"name": "todomvc-angular-perf", "name": "todomvc-angular-perf",
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "dependencies": {
"angular": "1.2.7", "angular": "1.2.8",
"todomvc-common": "~0.1.9" "todomvc-common": "~0.1.9"
} }
} }
...@@ -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.2.7", "angular": "1.2.8",
"todomvc-common": "~0.1.4" "todomvc-common": "~0.1.4"
}, },
"devDependencies": { "devDependencies": {
"angular-mocks": "1.2.7", "angular-mocks": "1.2.8",
"angular-route": "1.2.7" "angular-route": "1.2.8"
} }
} }
/** /**
* @license AngularJS v1.2.7 * @license AngularJS v1.2.8
* (c) 2010-2014 Google, Inc. http://angularjs.org * (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT * License: MIT
*/ */
......
...@@ -2,11 +2,14 @@ ...@@ -2,11 +2,14 @@
"name": "todomvc-angular", "name": "todomvc-angular",
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "dependencies": {
"angular": "1.2.7", "angular": "1.2.8",
"angularfire": "~0.5.0", "angularfire": "~0.5.0",
"todomvc-common": "~0.1.4" "todomvc-common": "~0.1.4"
}, },
"devDependencies": { "devDependencies": {
"angular-mocks": "1.2.6" "angular-mocks": "1.2.8"
},
"resolutions": {
"angular": "1.2.8"
} }
} }
/** /**
* @license AngularJS v1.2.6 * @license AngularJS v1.2.8
* (c) 2010-2014 Google, Inc. http://angularjs.org * (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT * License: MIT
*/ */
...@@ -1579,6 +1579,10 @@ function MockHttpExpectation(method, url, data, headers) { ...@@ -1579,6 +1579,10 @@ function MockHttpExpectation(method, url, data, headers) {
}; };
} }
function createMockXhr() {
return new MockXhr();
}
function MockXhr() { function MockXhr() {
// hack for testing $http, $httpBackend // hack for testing $http, $httpBackend
...@@ -2082,6 +2086,20 @@ if(window.jasmine || window.mocha) { ...@@ -2082,6 +2086,20 @@ if(window.jasmine || window.mocha) {
* *
* @param {...Function} fns any number of functions which will be injected using the injector. * @param {...Function} fns any number of functions which will be injected using the injector.
*/ */
var ErrorAddingDeclarationLocationStack = function(e, errorForStack) {
this.message = e.message;
this.name = e.name;
if (e.line) this.line = e.line;
if (e.sourceId) this.sourceId = e.sourceId;
if (e.stack && errorForStack)
this.stack = e.stack + '\n' + errorForStack.stack;
if (e.stackArray) this.stackArray = e.stackArray;
};
ErrorAddingDeclarationLocationStack.prototype.toString = Error.prototype.toString;
window.inject = angular.mock.inject = function() { window.inject = angular.mock.inject = function() {
var blockFns = Array.prototype.slice.call(arguments, 0); var blockFns = Array.prototype.slice.call(arguments, 0);
var errorForStack = new Error('Declaration Location'); var errorForStack = new Error('Declaration Location');
...@@ -2102,7 +2120,9 @@ if(window.jasmine || window.mocha) { ...@@ -2102,7 +2120,9 @@ if(window.jasmine || window.mocha) {
injector.invoke(blockFns[i] || angular.noop, this); injector.invoke(blockFns[i] || angular.noop, this);
/* jshint +W040 */ /* jshint +W040 */
} catch (e) { } catch (e) {
if(e.stack && errorForStack) e.stack += '\n' + errorForStack.stack; if (e.stack && errorForStack) {
throw new ErrorAddingDeclarationLocationStack(e, errorForStack);
}
throw e; throw e;
} finally { } finally {
errorForStack = null; errorForStack = null;
......
{ {
"name": "angular", "name": "angular",
"version": "1.2.7", "version": "1.2.8",
"main": "./angular.js", "main": "./angular.js",
"dependencies": { "dependencies": {
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"name": "todomvc-typescript-angular", "name": "todomvc-typescript-angular",
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "dependencies": {
"angular": "1.2.7", "angular": "1.2.8",
"todomvc-common": "~0.1.6" "todomvc-common": "~0.1.6"
} }
} }
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"name": "todomvc-angular-requirejs", "name": "todomvc-angular-requirejs",
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "dependencies": {
"angular": "1.2.7", "angular": "1.2.8",
"todomvc-common": "~0.1.9", "todomvc-common": "~0.1.9",
"requirejs": "~2.1.9" "requirejs": "~2.1.9"
} }
......
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