aboutsummaryrefslogtreecommitdiffstats
path: root/src/ng/location.js
diff options
context:
space:
mode:
authorRado Kirov2012-09-21 18:57:22 -0700
committerIgor Minar2012-11-26 23:21:02 +0100
commita32bc40fd75ca46e3581ad7a6e3a24a31df6e266 (patch)
tree7f913cd56637c896e23b7b830d2db3ade0483f12 /src/ng/location.js
parentcfe13b5dac3d1260400bb55194f2bc27169fd360 (diff)
downloadangular.js-a32bc40fd75ca46e3581ad7a6e3a24a31df6e266.tar.bz2
fix($location): reset $location.$$replace with every watch call
Closes #1111
Diffstat (limited to 'src/ng/location.js')
-rw-r--r--src/ng/location.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ng/location.js b/src/ng/location.js
index cf50952d..73ef7f7b 100644
--- a/src/ng/location.js
+++ b/src/ng/location.js
@@ -590,6 +590,7 @@ function $LocationProvider(){
var changeCounter = 0;
$rootScope.$watch(function $locationWatch() {
var oldUrl = $browser.url();
+ var currentReplace = $location.$$replace;
if (!changeCounter || oldUrl != $location.absUrl()) {
changeCounter++;
@@ -598,12 +599,12 @@ function $LocationProvider(){
defaultPrevented) {
$location.$$parse(oldUrl);
} else {
- $browser.url($location.absUrl(), $location.$$replace);
- $location.$$replace = false;
+ $browser.url($location.absUrl(), currentReplace);
afterLocationChange(oldUrl);
}
});
}
+ $location.$$replace = false;
return changeCounter;
});