From b72d7673f4180a0f23176cc02e52f55925c5b3ee Mon Sep 17 00:00:00 2001 From: MathMan05 Date: Mon, 2 Sep 2024 22:08:57 -0500 Subject: [PATCH] minor type update and bug fix --- .dist/emoji.js | 8 ++++++-- webpage/contextmenu.ts | 4 ++-- webpage/emoji.ts | 8 ++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.dist/emoji.js b/.dist/emoji.js index 55d61b0..4c3c627 100644 --- a/.dist/emoji.js +++ b/.dist/emoji.js @@ -148,7 +148,9 @@ class Emoji { body.append(emojiElem); emojiElem.addEventListener("click", () => { res(emojiClass); - Contextmenu.currentmenu.remove(); + if (Contextmenu.currentmenu !== "") { + Contextmenu.currentmenu.remove(); + } }); } }; @@ -182,7 +184,9 @@ class Emoji { body.append(emoji); emoji.onclick = _ => { res(emojit.emoji); - Contextmenu.currentmenu.remove(); + if (Contextmenu.currentmenu !== "") { + Contextmenu.currentmenu.remove(); + } }; } }; diff --git a/webpage/contextmenu.ts b/webpage/contextmenu.ts index b5a08ec..e600071 100644 --- a/webpage/contextmenu.ts +++ b/webpage/contextmenu.ts @@ -1,5 +1,5 @@ class Contextmenu{ - static currentmenu; + static currentmenu:HTMLElement|""; name:string; buttons:[string,(this:x,arg:y,e:MouseEvent)=>void,string|null,(this:x,arg:y)=>boolean,(this:x,arg:y)=>boolean,string][]; div:HTMLDivElement; @@ -9,7 +9,7 @@ class Contextmenu{ if(Contextmenu.currentmenu===""){ return; } - if(!Contextmenu.currentmenu.contains(event.target)){ + if(!Contextmenu.currentmenu.contains(event.target as Node)){ Contextmenu.currentmenu.remove(); Contextmenu.currentmenu=""; } diff --git a/webpage/emoji.ts b/webpage/emoji.ts index dd14a46..b8037a1 100644 --- a/webpage/emoji.ts +++ b/webpage/emoji.ts @@ -169,7 +169,9 @@ class Emoji{ emojiElem.addEventListener("click", ()=>{ res(emojiClass); - Contextmenu.currentmenu.remove(); + if(Contextmenu.currentmenu!==""){ + Contextmenu.currentmenu.remove(); + } }); } }; @@ -207,7 +209,9 @@ class Emoji{ body.append(emoji); emoji.onclick=_=>{ res(emojit.emoji); - Contextmenu.currentmenu.remove(); + if(Contextmenu.currentmenu!==""){ + Contextmenu.currentmenu.remove(); + } }; } };