fix(Scope): don't clear the phase when an exception is thrown from asyncQueue or watch

IgorMinar · IgorMinar · commit bf1a57ad4822 · 2014-08-18T21:20:12.000-07:00
If we clear it here, then any other watch or async task could start a new digest.
diff --git a/src/ng/rootScope.js b/src/ng/rootScope.js
@@ -699,7 +699,6 @@ function $RootScopeProvider(){
               asyncTask = asyncQueue.shift();
               asyncTask.scope.$eval(asyncTask.expression);
             } catch (e) {
-              clearPhase();
               $exceptionHandler(e);
             }
             lastDirtyWatch = null;
@@ -742,7 +741,6 @@ function $RootScopeProvider(){
                     }
                   }
                 } catch (e) {
-                  clearPhase();
                   $exceptionHandler(e);
                 }
               }
diff --git a/test/ng/rootScopeSpec.js b/test/ng/rootScopeSpec.js
@@ -176,15 +176,6 @@ 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

Original file line number	Diff line number	Diff line change
`@@ -699,7 +699,6 @@ function $RootScopeProvider(){`
`699`	`699`	`asyncTask = asyncQueue.shift();`
`700`	`700`	`asyncTask.scope.$eval(asyncTask.expression);`
`701`	`701`	`} catch (e) {`
`702`		`- clearPhase();`
`703`	`702`	`$exceptionHandler(e);`
`704`	`703`	`}`
`705`	`704`	`lastDirtyWatch = null;`
`@@ -742,7 +741,6 @@ function $RootScopeProvider(){`
`742`	`741`	`}`
`743`	`742`	`}`
`744`	`743`	`} catch (e) {`
`745`		`- clearPhase();`
`746`	`744`	`$exceptionHandler(e);`
`747`	`745`	`}`
`748`	`746`	`}`