Skip to content

Commit

Permalink
fix($location): $location.path() behaviour when $locationChangeStart …
Browse files Browse the repository at this point in the history
…is triggered by the browser

Fixed inconsistency in $location.path() behaviour on the $locationChangeStart event when using
back/forward buttons in the browser or manually changing the url in the address bar.
$location.path() now returns the target url in these cases.

Closes angular#4989
Closes angular#5089
Closes angular#5118
Closes angular#5580
  • Loading branch information
Sebastian K authored and jamesdaily committed Jan 27, 2014
1 parent 3a36c6e commit f1876d1
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 6 deletions.
13 changes: 7 additions & 6 deletions src/ng/location.js
Original file line number Diff line number Diff line change
Expand Up @@ -659,16 +659,17 @@ function $LocationProvider(){
// update $location when $browser url changes
$browser.onUrlChange(function(newUrl) {
if ($location.absUrl() != newUrl) {
if ($rootScope.$broadcast('$locationChangeStart', newUrl,
$location.absUrl()).defaultPrevented) {
$browser.url($location.absUrl());
return;
}
$rootScope.$evalAsync(function() {
var oldUrl = $location.absUrl();

$location.$$parse(newUrl);
afterLocationChange(oldUrl);
if ($rootScope.$broadcast('$locationChangeStart', newUrl,
oldUrl).defaultPrevented) {
$location.$$parse(oldUrl);
$browser.url(oldUrl);
} else {
afterLocationChange(oldUrl);
}
});
if (!$rootScope.$$phase) $rootScope.$digest();
}
Expand Down
28 changes: 28 additions & 0 deletions test/ng/locationSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
describe('$location', function() {
var url;

beforeEach(module(provideLog));

afterEach(function() {
// link rewriting used in html5 mode on legacy browsers binds to document.onClick, so we need
// to clean this up after each test.
Expand Down Expand Up @@ -1401,6 +1403,32 @@ describe('$location', function() {
dealoc($rootElement);
});
});

it('should always return the new url value via path() when $locationChangeStart event occurs regardless of cause',
inject(function($location, $rootScope, $browser, log) {
var base = $browser.url();

$rootScope.$on('$locationChangeStart', function() {
log($location.path());
});

// change through $location service
$rootScope.$apply(function() {
$location.path('/myNewPath');
});

// reset location
$rootScope.$apply(function() {
$location.path('');
});

// change through $browser
$browser.url(base + '#/myNewPath');
$browser.poll();

expect(log).toEqual(['/myNewPath', '/', '/myNewPath']);
})
);
});

describe('LocationHtml5Url', function() {
Expand Down

0 comments on commit f1876d1

Please sign in to comment.