diff options
| author | Rado Kirov | 2012-09-21 18:57:22 -0700 | 
|---|---|---|
| committer | Igor Minar | 2012-11-26 23:24:39 +0100 | 
| commit | fc781560a341c804b02c7efd30c6d3010206401c (patch) | |
| tree | 48de9757da5982e49eab1d79b58bd985a3726a27 /src/ng | |
| parent | c9199ee6634af6b960524d91bdae706860a49d0c (diff) | |
| download | angular.js-fc781560a341c804b02c7efd30c6d3010206401c.tar.bz2 | |
fix($location): reset $location.$$replace with every watch call
Closes #1111
Diffstat (limited to 'src/ng')
| -rw-r--r-- | src/ng/location.js | 5 | 
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;      });  | 
