mirror of
https://github.com/zhigang1992/angular.js.git
synced 2026-04-23 11:37:38 +08:00
fix($location): reset $location.$$replace with every watch call
Closes #1111
This commit is contained in:
@@ -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;
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user