natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'revert history api for now' (#10150) from Freeplay/calckey:history into develop 

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10150
This commit is contained in:
Kainoa Kanter 2023-05-18 16:03:21 +00:00
parent b5b8a7c7ef 2ed994fb6d
commit 9f397dd29f
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/client/src/components/MkModal.vue
View File

@ -177,10 +177,10 @@ let contentClicking = false;
const focusedElement = document.activeElement; const focusedElement = document.activeElement;
function close(ev, opts: { useSendAnimation?: boolean } = {}) { function close(ev, opts: { useSendAnimation?: boolean } = {}) {
removeEventListener("popstate", close); // removeEventListener("popstate", close);
if (props.preferType == "dialog") { // if (props.preferType == "dialog") {
history.forward(); // history.forward();
} // }
if (opts.useSendAnimation) { if (opts.useSendAnimation) {
useSendAnime = true; useSendAnime = true;
} }
@ -358,10 +358,10 @@ const onOpened = () => {
}, },
{ passive: true } { passive: true }
); );
if (props.preferType == "dialog") { // if (props.preferType == "dialog") {
history.pushState(null, "", location.href); // history.pushState(null, "", location.href);
} // }
addEventListener("popstate", close); // addEventListener("popstate", close);
}; };
onMounted(() => { onMounted(() => {
@ -388,10 +388,10 @@ onMounted(() => {
}); });
}); });
onUnmounted(() => { onUnmounted(() => {
removeEventListener("popstate", close); // removeEventListener("popstate", close);
if (props.preferType == "dialog") { // if (props.preferType == "dialog") {
history.back(); // history.back();
} // }
}); });
defineExpose({ defineExpose({