Merge pull request #458 from hurui200320/fix-pjax

Fix broken pjax
This commit is contained in:
Mike Cao
2021-02-01 21:15:45 -08:00
committed by GitHub

View File

@@ -134,19 +134,25 @@ import { removeTrailingSlash } from '../lib/url';
const handlePush = (state, title, url) => { const handlePush = (state, title, url) => {
removeEvents(); removeEvents();
// url is not guaranteed
// thus calling `url.toString()` might causes exception, then break the pjax update
// track only if url is validate
if (url) {
currentRef = currentUrl;
const newUrl = url.toString();
currentRef = currentUrl; if (newUrl.substring(0, 4) === 'http') {
const newUrl = url.toString(); currentUrl = '/' + newUrl.split('/').splice(3).join('/');
} else {
if (newUrl.substring(0, 4) === 'http') { currentUrl = newUrl;
currentUrl = '/' + newUrl.split('/').splice(3).join('/'); }
} else { // this function under some framework might be called multiple times
currentUrl = newUrl; // thus only track if currentUrl and currentRef are not same
if (currentUrl !== currentRef) {
trackView(currentUrl, currentRef);
setTimeout(addEvents, 300);
}
} }
trackView(currentUrl, currentRef);
setTimeout(addEvents, 300);
}; };
/* Global */ /* Global */