From ac086ae61619a86ee77149f39193d264a191932a Mon Sep 17 00:00:00 2001 From: quazzie Date: Fri, 22 Mar 2013 10:35:50 +0100 Subject: [PATCH] fix($location): back-button should fire $locationChangeStart Before $locationChangeStart event is not broadcast when pressing the back-button on the browser. Closes #2109 --- src/ng/location.js | 4 ++++ test/ng/locationSpec.js | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ng/location.js b/src/ng/location.js index 3196b1d57b7c..e99137d5cd4a 100644 --- a/src/ng/location.js +++ b/src/ng/location.js @@ -577,6 +577,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(); diff --git a/test/ng/locationSpec.js b/test/ng/locationSpec.js index bf91c25023ca..b6efe7836ab2 100644 --- a/test/ng/locationSpec.js +++ b/test/ng/locationSpec.js @@ -1216,7 +1216,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); @@ -1226,6 +1226,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/']); })