Permalink
Browse files

fix($location): back-button should fire $locationChangeStart

Before $locationChangeStart event is not broadcast when pressing the back-button on the browser.

Closes #2109
  • Loading branch information...
1 parent 660605b commit dc9a580617a838b63cbf5feae362b6f9cf5ed986 @quazzie quazzie committed with petebacondarwin Mar 22, 2013
Showing with 7 additions and 1 deletion.
  1. +4 −0 src/ng/location.js
  2. +3 −1 test/ng/locationSpec.js
View
@@ -546,6 +546,10 @@ 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();
View
@@ -1237,7 +1237,7 @@ describe('$location', function() {
expect($location.url()).toEqual('');
$rootScope.$on('$locationChangeStart', function(event, newUrl, oldUrl) {
- throw Error('there is no before when user enters URL directly to browser');
+ $log.info('start', newUrl, oldUrl);
});
$rootScope.$on('$locationChangeSuccess', function(event, newUrl, oldUrl) {
$log.info('after', newUrl, oldUrl);
@@ -1247,6 +1247,8 @@ describe('$location', function() {
$browser.url('http://server/#/somePath');
$browser.poll();
+ expect($log.info.logs.shift()).
+ toEqual(['start', 'http://server/#/somePath', 'http://server/']);
expect($log.info.logs.shift()).
toEqual(['after', 'http://server/#/somePath', 'http://server/']);
})

0 comments on commit dc9a580

Please sign in to comment.