Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-03-16 23:30:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing issue #98 (infinite loop when location hash set empty)

Browse source 
Added tests and fixed the issue.

Closes #98
This commit is contained in:
Vojta Jina 2010-10-31 02:11:50 +02:00 committed by Igor Minar
parent ba5f8ee27f
commit 99f25050a3
2 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/services.js
View file

@ -16,12 +16,15 @@ angularServiceInject("$document", function(window){
angularServiceInject("$location", function(browser) {
var scope = this,
location = {toString:toString, update:update, updateHash: updateHash},
lastLocationHref = browser.getUrl(),
lastBrowserUrl = browser.getUrl(),
lastLocationHref,
lastLocationHash;
browser.addPollFn(function(){
if (lastLocationHref !== browser.getUrl()) {
update(lastLocationHref = browser.getUrl());
browser.addPollFn(function() {
if (lastBrowserUrl != browser.getUrl()) {
update(lastBrowserUrl = browser.getUrl());
lastLocationHref = location.href;
lastLocationHash = location.hash;
scope.$eval();
}
});
@ -29,7 +32,8 @@ angularServiceInject("$location", function(browser) {
this.$onEval(PRIORITY_FIRST, updateBrowser);
this.$onEval(PRIORITY_LAST, updateBrowser);
update(lastLocationHref);
update(lastBrowserUrl);
lastLocationHref = location.href;
lastLocationHash = location.hash;
return location;
@ -137,8 +141,9 @@ angularServiceInject("$location", function(browser) {
function updateBrowser() {
updateLocation();
if (location.href != lastLocationHref) {
browser.setUrl(lastLocationHref = location.href);
if (location.href != lastLocationHref) {
browser.setUrl(lastBrowserUrl = location.href);
lastLocationHref = location.href;
lastLocationHash = location.hash;
}
}
@ -180,7 +185,7 @@ angularServiceInject("$location", function(browser) {
var match = URL_MATCH.exec(href);
if (match) {
loc.href = href.replace('#$', '');
loc.href = href.replace(/#$/, '');
loc.protocol = match[1];
loc.host = match[3] || '';
loc.port = match[5] || DEFAULT_PORTS[loc.protocol] || _null;

12
test/servicesSpec.js
View file

@ -207,6 +207,18 @@ describe("service", function(){
expect(scope.$location.hashSearch).toEqual({a: 'b'});
expect(scope.$location.hashPath).toEqual('path');
});
it('should remove # if hash is empty', function() {
scope.$location.update('http://www.angularjs.org/index.php#');
expect(scope.$location.href).toEqual('http://www.angularjs.org/index.php');
});
it('should not change browser\'s url with empty hash', function() {
$browser.setUrl('http://www.angularjs.org/index.php#');
spyOn($browser, 'setUrl');
$browser.poll();
expect($browser.setUrl).not.toHaveBeenCalled();
});
});
describe("$invalidWidgets", function(){