carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

fix inline emoji modal

master
Aevann 2023-10-06 20:18:02 +03:00
parent cc36aefa1d
commit 1883081451
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
files/assets/js/emoji_modal.js
View File

@ -473,7 +473,7 @@ function update_speed_emoji_modal(event)
* kept it unless someone wants to provide an option to toggle it for performance */ * kept it unless someone wants to provide an option to toggle it for performance */
if (curr_word_is_emoji() && current_word != ":") if (curr_word_is_emoji() && current_word != ":")
{ {
loadEmojis().then( () => { loadEmojis(null, null).then( () => {
let modal_pos = event.target.getBoundingClientRect(); let modal_pos = event.target.getBoundingClientRect();
modal_pos.x += window.scrollX; modal_pos.x += window.scrollX;
modal_pos.y += window.scrollY; modal_pos.y += window.scrollY;
@ -545,20 +545,21 @@ function loadEmojis(t, inputTargetIDName)
selecting = false; selecting = false;
speed_carot_modal.style.display = "none"; speed_carot_modal.style.display = "none";
emojiInputTargetDOM = document.getElementById(inputTargetIDName); if (inputTargetIDName) {
emojiInputTargetDOM = document.getElementById(inputTargetIDName);
emojiModal.addEventListener('hide.bs.modal', () => {
setTimeout(() => {
emojiInputTargetDOM.focus();
}, 200);
}, {once : true});
}
if (t.dataset.previousModal) { if (t && t.dataset.previousModal) {
emojiModal.addEventListener('hide.bs.modal', () => { emojiModal.addEventListener('hide.bs.modal', () => {
bootstrap.Modal.getOrCreateInstance(document.getElementById(t.dataset.previousModal)).show() bootstrap.Modal.getOrCreateInstance(document.getElementById(t.dataset.previousModal)).show()
}, {once : true}); }, {once : true});
} }
emojiModal.addEventListener('hide.bs.modal', () => {
setTimeout(() => {
emojiInputTargetDOM.focus();
}, 200);
}, {once : true});
switch (emojiEngineState) { switch (emojiEngineState) {
case "inactive": case "inactive":
emojiEngineState = "loading" emojiEngineState = "loading"