diff options
Diffstat (limited to 'js/vendor/angular-mocks')
-rw-r--r-- | js/vendor/angular-mocks/.bower.json | 10 | ||||
-rw-r--r-- | js/vendor/angular-mocks/angular-mocks.js | 9 | ||||
-rw-r--r-- | js/vendor/angular-mocks/bower.json | 4 | ||||
-rw-r--r-- | js/vendor/angular-mocks/package.json | 2 |
4 files changed, 13 insertions, 12 deletions
diff --git a/js/vendor/angular-mocks/.bower.json b/js/vendor/angular-mocks/.bower.json index 0de007922..8db620b25 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.3954+sha.9dfa949", + "version": "1.4.0-rc.0", "main": "./angular-mocks.js", "ignore": [], "dependencies": { - "angular": "1.4.0-build.3954+sha.9dfa949" + "angular": "1.4.0-rc.0" }, "homepage": "https://github.com/angular/bower-angular-mocks", - "_release": "1.4.0-build.3954+sha.9dfa949", + "_release": "1.4.0-rc.0", "_resolution": { "type": "version", - "tag": "v1.4.0-build.3954+sha.9dfa949", - "commit": "2e7384e5bd7e2e54d49bafdd2b43188125b0a508" + "tag": "v1.4.0-rc.0", + "commit": "7dd2ab23cb97424a7261086b7e7140f2e1166502" }, "_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 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; diff --git a/js/vendor/angular-mocks/bower.json b/js/vendor/angular-mocks/bower.json index 44bc259fb..c477924ee 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.3954+sha.9dfa949", + "version": "1.4.0-rc.0", "main": "./angular-mocks.js", "ignore": [], "dependencies": { - "angular": "1.4.0-build.3954+sha.9dfa949" + "angular": "1.4.0-rc.0" } } diff --git a/js/vendor/angular-mocks/package.json b/js/vendor/angular-mocks/package.json index f71a95b71..1e1820e71 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.3954+sha.9dfa949", + "version": "1.4.0-rc.0", "description": "AngularJS mocks for testing", "main": "angular-mocks.js", "scripts": { |