Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
carson 2021-03-11 05:12:06 -07:00
commit a679dea62c

View File

@ -1526,7 +1526,6 @@ return (function () {
function restoreHistory(path) { function restoreHistory(path) {
saveHistory(); saveHistory();
path = path || location.pathname+location.search; path = path || location.pathname+location.search;
triggerEvent(getDocument().body, "htmx:historyRestore", {path:path});
var cached = getCachedHistory(path); var cached = getCachedHistory(path);
if (cached) { if (cached) {
var fragment = makeFragment(cached.content); var fragment = makeFragment(cached.content);
@ -1544,6 +1543,7 @@ return (function () {
loadHistoryFromServer(path); loadHistoryFromServer(path);
} }
} }
triggerEvent(getDocument().body, "htmx:historyRestore", {path:path});
} }
function shouldPush(elt) { function shouldPush(elt) {