summaryrefslogtreecommitdiffstats
path: root/js/vendor/angular-mocks/angular-mocks.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/vendor/angular-mocks/angular-mocks.js')
-rw-r--r--js/vendor/angular-mocks/angular-mocks.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/js/vendor/angular-mocks/angular-mocks.js b/js/vendor/angular-mocks/angular-mocks.js
index 616ce3d00..f9608184a 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.3954+sha.9dfa949
+ * @license AngularJS v1.4.0-rc.0
* (c) 2010-2015 Google, Inc. http://angularjs.org
* License: MIT
*/
@@ -771,13 +771,14 @@ angular.mock.animate = angular.module('ngAnimateMock', ['ng'])
};
});
- $provide.decorator('$animate', ['$delegate', '$$asyncCallback', '$timeout', '$browser',
- function($delegate, $$asyncCallback, $timeout, $browser) {
+ $provide.decorator('$animate', ['$delegate', '$$asyncCallback', '$timeout', '$browser', '$$rAF',
+ function($delegate, $$asyncCallback, $timeout, $browser, $$rAF) {
var animate = {
queue: [],
cancel: $delegate.cancel,
enabled: $delegate.enabled,
triggerCallbackEvents: function() {
+ $$rAF.flush();
$$asyncCallback.flush();
},
triggerCallbackPromise: function() {
@@ -1764,7 +1765,7 @@ angular.mock.$RAFDecorator = ['$delegate', function($delegate) {
queue[i]();
}
- queue = [];
+ queue = queue.slice(i);
};
return rafFn;