aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ng/browser.js2
-rwxr-xr-xtest/ng/browserSpecs.js5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ng/browser.js b/src/ng/browser.js
index 68e8ba93..3bb51b57 100644
--- a/src/ng/browser.js
+++ b/src/ng/browser.js
@@ -253,7 +253,7 @@ function Browser(window, document, $log, $sniffer) {
*/
self.baseHref = function() {
var href = baseElement.attr('href');
- return href ? href.replace(/^https?\:\/\/[^\/]*/, '') : '';
+ return href ? href.replace(/^(https?\:)?\/\/[^\/]*/, '') : '';
};
//////////////////////////////////////////////////////////////
diff --git a/test/ng/browserSpecs.js b/test/ng/browserSpecs.js
index 6c6ac30e..4157ecbd 100755
--- a/test/ng/browserSpecs.js
+++ b/test/ng/browserSpecs.js
@@ -609,5 +609,10 @@ describe('browser', function() {
fakeDocument.basePath = 'http://host.com/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/');
+ });
});
});