aboutsummaryrefslogtreecommitdiffstats
path: root/src/ng/rootScope.js
diff options
context:
space:
mode:
authorThomas Guillory2013-11-06 15:01:10 +0100
committerJeff Cross2013-12-04 10:11:29 -0800
commitd3c486dd6dfa8d5dca32a3e28aa685fb7260c878 (patch)
tree6124ee32d9c1adaacc0060a99c025810aeda3871 /src/ng/rootScope.js
parent2d0f6ccba896fe34141d6d4f59eef6fba580c5c2 (diff)
downloadangular.js-d3c486dd6dfa8d5dca32a3e28aa685fb7260c878.tar.bz2
fix($rootScope): clear phase if an exception is raised by a watcher
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
Diffstat (limited to 'src/ng/rootScope.js')
-rw-r--r--src/ng/rootScope.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ng/rootScope.js b/src/ng/rootScope.js
index 1d8d4e77..13ee4c70 100644
--- a/src/ng/rootScope.js
+++ b/src/ng/rootScope.js
@@ -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);
}
}