aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVojta Jina2013-08-14 15:55:27 -0700
committerVojta Jina2013-08-14 16:04:48 -0700
commita5fb372e1e6aed8cdb1f572f1df3d6fe89388f3e (patch)
tree2f5313d345b84a816e2ac9bdea5ccba499e3ce2d /src
parentda720712f32c7d017afd2adf362160cb5f4a4f40 (diff)
downloadangular.js-a5fb372e1e6aed8cdb1f572f1df3d6fe89388f3e.tar.bz2
fix(mocks.$timeout): forward delay argument
The $timeout decorator was not forwarding the delay argument to `browser.defer.flush(delay)`.
Diffstat (limited to 'src')
-rw-r--r--src/ngMock/angular-mocks.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js
index 3f58b399..5d8b1b33 100644
--- a/src/ngMock/angular-mocks.js
+++ b/src/ngMock/angular-mocks.js
@@ -1446,8 +1446,8 @@ angular.module('ngMock', ['ng']).provider({
$rootElement: angular.mock.$RootElementProvider
}).config(function($provide) {
$provide.decorator('$timeout', function($delegate, $browser) {
- $delegate.flush = function() {
- $browser.defer.flush();
+ $delegate.flush = function(delay) {
+ $browser.defer.flush(delay);
};
return $delegate;
});