summaryrefslogtreecommitdiffstats
path: root/js/vendor/angular-mocks
diff options
context:
space:
mode:
Diffstat (limited to 'js/vendor/angular-mocks')
-rw-r--r--js/vendor/angular-mocks/.bower.json10
-rw-r--r--js/vendor/angular-mocks/angular-mocks.js11
-rw-r--r--js/vendor/angular-mocks/bower.json4
-rw-r--r--js/vendor/angular-mocks/package.json2
4 files changed, 16 insertions, 11 deletions
diff --git a/js/vendor/angular-mocks/.bower.json b/js/vendor/angular-mocks/.bower.json
index 5b1e6dfa6..5e5822b69 100644
--- a/js/vendor/angular-mocks/.bower.json
+++ b/js/vendor/angular-mocks/.bower.json
@@ -1,17 +1,17 @@
{
"name": "angular-mocks",
- "version": "1.4.0-build.3887+sha.41fdb3d",
+ "version": "1.4.0-build.3911+sha.e57138d",
"main": "./angular-mocks.js",
"ignore": [],
"dependencies": {
- "angular": "1.4.0-build.3887+sha.41fdb3d"
+ "angular": "1.4.0-build.3911+sha.e57138d"
},
"homepage": "https://github.com/angular/bower-angular-mocks",
- "_release": "1.4.0-build.3887+sha.41fdb3d",
+ "_release": "1.4.0-build.3911+sha.e57138d",
"_resolution": {
"type": "version",
- "tag": "v1.4.0-build.3887+sha.41fdb3d",
- "commit": "c8dd069840aefe73ea8bb53bb06a17b7778292e2"
+ "tag": "v1.4.0-build.3911+sha.e57138d",
+ "commit": "517c26c659aee2b19632162fa4a01b02d17e82ec"
},
"_source": "git://github.com/angular/bower-angular-mocks.git",
"_target": "~1.4.*",
diff --git a/js/vendor/angular-mocks/angular-mocks.js b/js/vendor/angular-mocks/angular-mocks.js
index 12edf51cf..f4eadcdec 100644
--- a/js/vendor/angular-mocks/angular-mocks.js
+++ b/js/vendor/angular-mocks/angular-mocks.js
@@ -1,5 +1,5 @@
/**
- * @license AngularJS v1.4.0-build.3887+sha.41fdb3d
+ * @license AngularJS v1.4.0-build.3911+sha.e57138d
* (c) 2010-2015 Google, Inc. http://angularjs.org
* License: MIT
*/
@@ -432,6 +432,7 @@ angular.mock.$LogProvider = function() {
* indefinitely.
* @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
* will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
+ * @param {...*=} Pass additional parameters to the executed function.
* @returns {promise} A promise which will be notified on each iteration.
*/
angular.mock.$IntervalProvider = function() {
@@ -442,13 +443,17 @@ angular.mock.$IntervalProvider = function() {
now = 0;
var $interval = function(fn, delay, count, invokeApply) {
- var iteration = 0,
+ var hasParams = arguments.length > 4,
+ args = hasParams ? Array.prototype.slice.call(arguments, 4) : [],
+ iteration = 0,
skipApply = (angular.isDefined(invokeApply) && !invokeApply),
deferred = (skipApply ? $$q : $q).defer(),
promise = deferred.promise;
count = (angular.isDefined(count)) ? count : 0;
- promise.then(null, null, fn);
+ promise.then(null, null, (!hasParams) ? fn : function() {
+ fn.apply(null, args);
+ });
promise.$$intervalId = nextRepeatId;
diff --git a/js/vendor/angular-mocks/bower.json b/js/vendor/angular-mocks/bower.json
index 91621c43d..24d30c98b 100644
--- a/js/vendor/angular-mocks/bower.json
+++ b/js/vendor/angular-mocks/bower.json
@@ -1,9 +1,9 @@
{
"name": "angular-mocks",
- "version": "1.4.0-build.3887+sha.41fdb3d",
+ "version": "1.4.0-build.3911+sha.e57138d",
"main": "./angular-mocks.js",
"ignore": [],
"dependencies": {
- "angular": "1.4.0-build.3887+sha.41fdb3d"
+ "angular": "1.4.0-build.3911+sha.e57138d"
}
}
diff --git a/js/vendor/angular-mocks/package.json b/js/vendor/angular-mocks/package.json
index 1493c10e6..022cb5b34 100644
--- a/js/vendor/angular-mocks/package.json
+++ b/js/vendor/angular-mocks/package.json
@@ -1,6 +1,6 @@
{
"name": "angular-mocks",
- "version": "1.4.0-build.3887+sha.41fdb3d",
+ "version": "1.4.0-build.3911+sha.e57138d",
"description": "AngularJS mocks for testing",
"main": "angular-mocks.js",
"scripts": {