fixed issue where ajaxify couldn't handle urls with "#" href if the currently address already had a hash value present.

v1.18.x
Julian Lam 10 years ago
parent b83492daa2
commit d712dcdce1

@ -280,18 +280,19 @@ $(document).ready(function() {
(RELATIVE_PATH.length > 0 ? this.pathname.indexOf(RELATIVE_PATH) === 0 : true)) // Subfolder installs need this additional check (RELATIVE_PATH.length > 0 ? this.pathname.indexOf(RELATIVE_PATH) === 0 : true)) // Subfolder installs need this additional check
) { ) {
// Internal link // Internal link
var url = this.href.replace(rootUrl + '/', ''); var url = this.href.replace(rootUrl + RELATIVE_PATH + '/', '');
if(window.location.pathname === this.pathname && this.hash) { if(window.location.pathname !== this.pathname) {
if (ajaxify.go(url)) {
e.preventDefault();
}
} else {
// Special handling for urls with hashes
if (this.hash !== window.location.hash) { if (this.hash !== window.location.hash) {
window.location.hash = this.hash; window.location.hash = this.hash;
} }
e.preventDefault(); e.preventDefault();
} else {
if (ajaxify.go(url)) {
e.preventDefault();
}
} }
} else if (window.location.pathname !== '/outgoing') { } else if (window.location.pathname !== '/outgoing') {
// External Link // External Link

Loading…
Cancel
Save