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

Fix right nav closing on character create / delete / popup click

Browse Source
This commit is contained in:
SillyLossy
2023-03-26 22:17:18 +03:00
parent 0e00e1b363
commit 96faff5b2e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/script.js
View File

@@ -3272,7 +3272,6 @@ $(document).ready(function () {
$("#character_popup").css("display", "none"); $("#character_popup").css("display", "none");
}); });
$("#dialogue_popup_ok").click(function (e) { $("#dialogue_popup_ok").click(function (e) {
e.stopPropagation();
$("#shadow_popup").css("display", "none"); $("#shadow_popup").css("display", "none");
$("#shadow_popup").css("opacity:", 0.0); $("#shadow_popup").css("opacity:", 0.0);
if (popup_type == "del_bg") { if (popup_type == "del_bg") {
@@ -3354,7 +3353,6 @@ $(document).ready(function () {
} }
}); });
$("#dialogue_popup_cancel").click(function (e) { $("#dialogue_popup_cancel").click(function (e) {
e.stopPropagation();
$("#shadow_popup").css("display", "none"); $("#shadow_popup").css("display", "none");
$("#shadow_popup").css("opacity:", 0.0); $("#shadow_popup").css("opacity:", 0.0);
popup_type = ""; popup_type = "";
@@ -4177,6 +4175,14 @@ $(document).ready(function () {
$("html").click(function (e) { $("html").click(function (e) {
var clickTarget = $(e.target); var clickTarget = $(e.target);
const forbiddenTargets = ['#character_cross', '#avatar-and-name-block', '#shadow_popup'];
for (const id of forbiddenTargets) {
if (clickTarget.closest(id).length > 0) {
return;
}
}
var targetParentHasOpenDrawer = clickTarget.parents('.openDrawer').length; var targetParentHasOpenDrawer = clickTarget.parents('.openDrawer').length;
if (clickTarget.hasClass('drawer-icon') == false && !clickTarget.hasClass('openDrawer')) { if (clickTarget.hasClass('drawer-icon') == false && !clickTarget.hasClass('openDrawer')) {
if (jQuery.find('.openDrawer').length !== 0) { if (jQuery.find('.openDrawer').length !== 0) {