kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-04-08 17:10:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix($location): don't call indexOf() of undefined href attribute

Browse Source 
Closes #7721
Closes #8681
This commit is contained in:
Caitlin Potter
2014-08-19 18:49:35 -04:00
parent 08cc6edd38
commit 74a7afcb31
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ng/location.js
View File

@@ -670,7 +670,7 @@ function $LocationProvider(){
// http://msdn.microsoft.com/en-us/library/ie/dd347148(v=vs.85).aspx
var href = elm.attr('href') || elm.attr('xlink:href');
if (href.indexOf('://') < 0) { // Ignore absolute URLs
if (href && href.indexOf('://') < 0) { // Ignore absolute URLs
var prefix = '#' + hashPrefix;
if (href[0] == '/') {
// absolute path - replace old path

32
test/ng/locationSpec.js
View File

@@ -811,15 +811,21 @@ describe('$location', function() {
attrs = attrs ? ' ' + attrs + ' ' : '';
// fake the base behavior
if (!relLink) {
if (linkHref[0] == '/') {
linkHref = 'http://host.com' + linkHref;
} else if(!linkHref.match(/:\/\//)) {
linkHref = 'http://host.com/base/' + linkHref;
if (typeof linkHref === 'string') {
if (!relLink) {
if (linkHref[0] == '/') {
linkHref = 'http://host.com' + linkHref;
} else if(!linkHref.match(/:\/\//)) {
linkHref = 'http://host.com/base/' + linkHref;
}
}
}
link = jqLite('<a href="' + linkHref + '"' + attrs + '>' + content + '</a>')[0];
if (linkHref) {
link = jqLite('<a href="' + linkHref + '"' + attrs + '>' + content + '</a>')[0];
} else {
link = jqLite('<a ' + attrs + '>' + content + '</a>')[0];
}
$provide.value('$sniffer', {history: supportHist});
$locationProvider.html5Mode(html5Mode);
@@ -934,6 +940,20 @@ describe('$location', function() {
});
// Regression (gh-7721)
it('should not throw when clicking anchor with no href attribute when history enabled on old browser', function() {
configureService(null, true, false);
inject(
initBrowser(),
initLocation(),
function($browser) {
browserTrigger(link, 'click');
expectNoRewrite($browser);
}
);
});
it('should rewrite abs link to hashbang url when history enabled on old browser', function() {
configureService('/base/link?a#b', true, false);
inject(