From 21cd802ccbea4453e0957d8732cc6a626af5b812 Mon Sep 17 00:00:00 2001 From: Aevann Date: Sat, 1 Jul 2023 03:13:57 +0300 Subject: [PATCH] fix this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4302260#context --- files/assets/js/bottom.js | 3 +++ files/assets/js/comments_v.js | 2 ++ files/assets/js/edit_post.js | 2 ++ files/assets/js/emoji_modal.js | 8 ++++++-- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/files/assets/js/bottom.js b/files/assets/js/bottom.js index 3eed886df..c6c7ec672 100644 --- a/files/assets/js/bottom.js +++ b/files/assets/js/bottom.js @@ -198,6 +198,9 @@ document.addEventListener("click", function (e) { if (element.dataset.toggleelement) { + if (element.dataset.toggleelement.startsWith('#reply-')) + close_inline_speed_emoji_modal(); + const toggling = document.querySelector(element.dataset.toggleelement) const attr = element.dataset.toggleattr; diff --git a/files/assets/js/comments_v.js b/files/assets/js/comments_v.js index 7b4cc014e..854317903 100644 --- a/files/assets/js/comments_v.js +++ b/files/assets/js/comments_v.js @@ -85,6 +85,8 @@ function toggleEdit(id){ actions.classList.toggle("d-none"); autoExpand(box); markdown(box); + + close_inline_speed_emoji_modal(); }; diff --git a/files/assets/js/edit_post.js b/files/assets/js/edit_post.js index b331763ac..58bcea941 100644 --- a/files/assets/js/edit_post.js +++ b/files/assets/js/edit_post.js @@ -12,4 +12,6 @@ function togglePostEdit(id){ markdown(box); box=document.getElementById("post-edit-title"); autoExpand(box); + + close_inline_speed_emoji_modal(); }; diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js index ca8624146..aa1330296 100644 --- a/files/assets/js/emoji_modal.js +++ b/files/assets/js/emoji_modal.js @@ -364,6 +364,11 @@ function curr_word_is_emoji() current_word.charAt(current_word.length-1) != ":"; } +function close_inline_speed_emoji_modal() { + selecting = false; + speed_carot_modal.style.display = "none"; +} + function populate_speed_emoji_modal(results, textbox) { selecting = true; @@ -407,8 +412,7 @@ function populate_speed_emoji_modal(results, textbox) if (current_word.includes("!")) name = `!${name}` emoji_option.addEventListener('click', () => { - selecting = false; - speed_carot_modal.style.display = "none"; + close_inline_speed_emoji_modal() textbox.value = textbox.value.replace(new RegExp(current_word+"(?=\\s|$)", "gi"), `:${name}: `) textbox.focus() if (document.location.pathname != '/chat'){