rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-04-13 02:12:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2103 from LenAnderson/fix-popup-escape

Browse Source 
only close last popup with escape
This commit is contained in:
Cohee 2024-04-19 01:15:03 +03:00 committed by GitHub
commit 5084b4ae64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/scripts/popup.js
View File

@ -119,6 +119,9 @@ export class Popup {
const keyListener = (evt) => { const keyListener = (evt) => {
switch (evt.key) { switch (evt.key) {
case 'Escape': { case 'Escape': {
// does it really matter where we check?
const topModal = document.elementFromPoint(window.innerWidth / 2, window.innerHeight / 2)?.closest('.shadow_popup');
if (topModal == this.dom) {
evt.preventDefault(); evt.preventDefault();
evt.stopPropagation(); evt.stopPropagation();
this.completeCancelled(); this.completeCancelled();
@ -126,6 +129,7 @@ export class Popup {
break; break;
} }
} }
}
}; };
const keyListenerBound = keyListener.bind(this); const keyListenerBound = keyListener.bind(this);
window.addEventListener('keydown', keyListenerBound); window.addEventListener('keydown', keyListenerBound);