aboutsummaryrefslogtreecommitdiffstats
path: root/src/service
diff options
context:
space:
mode:
Diffstat (limited to 'src/service')
-rw-r--r--src/service/http.js2
-rw-r--r--src/service/scope.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/service/http.js b/src/service/http.js
index 6efe7474..8458617b 100644
--- a/src/service/http.js
+++ b/src/service/http.js
@@ -229,7 +229,7 @@ function $HttpProvider() {
/**
* Represents Request object, returned by $http()
*
- * !!! ACCESS CLOSURE VARS:
+ * !!! ACCESSES CLOSURE VARS:
* $httpBackend, $browser, $config, $log, $rootScope, defaultCache, $http.pendingRequests
*/
function XhrFuture() {
diff --git a/src/service/scope.js b/src/service/scope.js
index cbda4495..d6cf60c9 100644
--- a/src/service/scope.js
+++ b/src/service/scope.js
@@ -381,11 +381,11 @@ function $RootScopeProvider(){
}
} while ((current = next));
- if(!(ttl--)) {
+ if(dirty && !(ttl--)) {
throw Error('100 $digest() iterations reached. Aborting!\n' +
'Watchers fired in the last 5 iterations: ' + toJson(watchLog));
}
- } while (dirty);
+ } while (dirty || asyncQueue.length);
},
/**