diff options
| author | Igor Minar | 2011-11-08 01:56:42 -0800 |
|---|---|---|
| committer | Igor Minar | 2011-11-30 14:49:03 -0500 |
| commit | 1cdfa3b9601c199ec0b45096b38e26350eca744f (patch) | |
| tree | c6b87d6a8cdbcd7e65a1bbad304df25e993b8568 /src/service | |
| parent | 16363d8000a484b428a16eb07d8bd0f19c4b4337 (diff) | |
| download | angular.js-1cdfa3b9601c199ec0b45096b38e26350eca744f.tar.bz2 | |
feat(deferreds/promises): Q-like deferred/promise implementation with a ton of specs
Diffstat (limited to 'src/service')
| -rw-r--r-- | src/service/http.js | 2 | ||||
| -rw-r--r-- | src/service/scope.js | 4 |
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); }, /** |