diff options
| author | Pete Bacon Darwin | 2013-12-17 22:53:28 +0000 |
|---|---|---|
| committer | Pete Bacon Darwin | 2013-12-17 22:53:28 +0000 |
| commit | 73c66715c9a13b0fdacf98a9e9f237063a97ebc3 (patch) | |
| tree | 4067f429946d0a99c82ae1ad1f7917ae5c62e4b9 /docs/components | |
| parent | cb29632a5802e930262919b3db64ca4806c5cfc7 (diff) | |
| download | angular.js-73c66715c9a13b0fdacf98a9e9f237063a97ebc3.tar.bz2 | |
docs(bootstrap-prettify): fix $timeout issues and update related docs
End 2 end tests wait for all `$timeout`s to be run before completing the test.
This was problematic where we were using timeouts that restarted themselves because
there would never be a point when all timeouts had completed, causing the tests to hang.
To fix this $timeout had been monkey-patched but this caused other issue itself.
Now that we have $interval we don't need to use $timeout handlers that re-trigger the $timeout
so we can ditch the monkey-patch.
This commit tidies up any examples that are using this approach and changes them to use $interval
instead.
Closes #5232
Diffstat (limited to 'docs/components')
| -rw-r--r-- | docs/components/angular-bootstrap/bootstrap-prettify.js | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/docs/components/angular-bootstrap/bootstrap-prettify.js b/docs/components/angular-bootstrap/bootstrap-prettify.js index 72c136d1..5129c4e1 100644 --- a/docs/components/angular-bootstrap/bootstrap-prettify.js +++ b/docs/components/angular-bootstrap/bootstrap-prettify.js @@ -215,17 +215,7 @@ directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location', }]; this.html5Mode = angular.noop; }); - $provide.decorator('$timeout', ['$rootScope', '$delegate', function($rootScope, $delegate) { - return angular.extend(function(fn, delay) { - if (delay && delay > 50) { - return setTimeout(function() { - $rootScope.$apply(fn); - }, delay); - } else { - return $delegate.apply(this, arguments); - } - }, $delegate); - }]); + $provide.decorator('$rootScope', ['$delegate', function($delegate) { embedRootScope = $delegate; |
