kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-04-02 09:00:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix($rootScope): clear phase if an exception is raised by a watcher

Browse Source 
Add calls to clearPhase() when an exception is raised by a watcher
while a digest cycle, in order to not be stuck on `$digest` scope phase
This commit is contained in:
Thomas Guillory
2013-11-06 15:01:10 +01:00
committed by Jeff Cross
parent 2d0f6ccba8
commit d3c486dd6d
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ng/rootScope.js
View File

@@ -562,6 +562,7 @@ function $RootScopeProvider(){
asyncTask = asyncQueue.shift();
asyncTask.scope.$eval(asyncTask.expression);
} catch (e) {
clearPhase();
$exceptionHandler(e);
}
}
@@ -594,6 +595,7 @@ function $RootScopeProvider(){
}
}
} catch (e) {
clearPhase();
$exceptionHandler(e);
}
}

9
test/ng/rootScopeSpec.js
View File

@@ -127,6 +127,15 @@ describe('Scope', function() {
});
});
it('should clear phase if an exception interrupt $digest cycle', function() {
inject(function($rootScope) {
$rootScope.$watch('a', function() {throw new Error('abc');});
$rootScope.a = 1;
try { $rootScope.$digest(); } catch(e) { }
expect($rootScope.$$phase).toBeNull();
});
});
it('should fire watches in order of addition', inject(function($rootScope) {
// this is not an external guarantee, just our own sanity