aboutsummaryrefslogtreecommitdiffstats
path: root/docs/content/guide/dev_guide.services.managing_dependencies.ngdoc
diff options
context:
space:
mode:
authorPete Bacon Darwin2013-12-17 22:53:28 +0000
committerPete Bacon Darwin2013-12-17 22:53:28 +0000
commit73c66715c9a13b0fdacf98a9e9f237063a97ebc3 (patch)
tree4067f429946d0a99c82ae1ad1f7917ae5c62e4b9 /docs/content/guide/dev_guide.services.managing_dependencies.ngdoc
parentcb29632a5802e930262919b3db64ca4806c5cfc7 (diff)
downloadangular.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/content/guide/dev_guide.services.managing_dependencies.ngdoc')
-rw-r--r--docs/content/guide/dev_guide.services.managing_dependencies.ngdoc7
1 files changed, 3 insertions, 4 deletions
diff --git a/docs/content/guide/dev_guide.services.managing_dependencies.ngdoc b/docs/content/guide/dev_guide.services.managing_dependencies.ngdoc
index b069f4bb..a0d95d4a 100644
--- a/docs/content/guide/dev_guide.services.managing_dependencies.ngdoc
+++ b/docs/content/guide/dev_guide.services.managing_dependencies.ngdoc
@@ -50,7 +50,7 @@ of which depend on other services that are provided by the Angular framework:
* @param {*} message Message to be logged.
*/
function batchLogModule($provide){
- $provide.factory('batchLog', ['$timeout', '$log', function($timeout, $log) {
+ $provide.factory('batchLog', ['$interval', '$log', function($interval, $log) {
var messageQueue = [];
function log() {
@@ -58,11 +58,10 @@ of which depend on other services that are provided by the Angular framework:
$log('batchLog messages: ', messageQueue);
messageQueue = [];
}
- $timeout(log, 50000);
}
// start periodic checking
- log();
+ $interval(log, 50000);
return function(message) {
messageQueue.push(message);
@@ -88,7 +87,7 @@ of which depend on other services that are provided by the Angular framework:
Things to notice in this example:
-* The `batchLog` service depends on the built-in {@link api/ng.$timeout $timeout} and
+* The `batchLog` service depends on the built-in {@link api/ng.$interval $interval} and
{@link api/ng.$log $log} services, and allows messages to be logged into the
`console.log` in batches.
* The `routeTemplateMonitor` service depends on the built-in {@link api/ngRoute.$route