Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-22 13:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix($browser): remove base href domain when url begins with '//'

Browse source 
This change prevents an incorrect appBase url from being calculated when the
<base> href's domain begins with '//'.

Closes #5606
This commit is contained in:
Caitlin Potter 2014-01-02 19:12:31 -05:00 committed by Igor Minar
parent c9705b7556
commit 760f2fb731
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ng/browser.js
View file

@ -253,7 +253,7 @@ function Browser(window, document, $log, $sniffer) {
*/ */
self.baseHref = function() { self.baseHref = function() {
var href = baseElement.attr('href'); var href = baseElement.attr('href');
return href ? href.replace(/^https?\:\/\/[^\/]*/, '') : ''; return href ? href.replace(/^(https?\:)?\/\/[^\/]*/, '') : '';
}; };
////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////

5
test/ng/browserSpecs.js
View file

@ -609,5 +609,10 @@ describe('browser', function() {
fakeDocument.basePath = 'http://host.com/base/path/index.html'; fakeDocument.basePath = 'http://host.com/base/path/index.html';
expect(browser.baseHref()).toEqual('/base/path/index.html'); expect(browser.baseHref()).toEqual('/base/path/index.html');
}); });
it('should remove domain from <base href> beginning with \'//\'', function() {
fakeDocument.basePath = '//google.com/base/path/';
expect(browser.baseHref()).toEqual('/base/path/');
});
}); });
}); });