From 73c66715c9a13b0fdacf98a9e9f237063a97ebc3 Mon Sep 17 00:00:00 2001 From: Pete Bacon Darwin Date: Tue, 17 Dec 2013 22:53:28 +0000 Subject: 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 --- docs/components/angular-bootstrap/bootstrap-prettify.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'docs/components/angular-bootstrap') 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; -- cgit v1.2.3