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

Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev

Browse Source
This commit is contained in:
SillyLossy
2023-03-22 12:29:10 +02:00
parent 4e2bc3e80a 3ebca48279
commit 6aa7bef671
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
public/script.js
View File

@ -1797,11 +1797,11 @@ function getChatResult() {
select_selected_character(this_chid); select_selected_character(this_chid);
} }
function openNavToggle() { /* function openNavToggle() {
if (!$("#nav-toggle").prop("checked")) { if (!$("#nav-toggle").prop("checked")) {
$("#nav-toggle").trigger("click"); $("#nav-toggle").trigger("click");
} }
} } */
////////// OPTIMZED MAIN API CHANGE FUNCTION //////////// ////////// OPTIMZED MAIN API CHANGE FUNCTION ////////////
@ -4062,4 +4062,21 @@ $(document).ready(function () {
drawer.toggleClass('closedDrawer openDrawer'); drawer.toggleClass('closedDrawer openDrawer');
} }
}); });
});
$("html").click(function (e) {
var clickTarget = $(e.target);
var targetParentHasOpenDrawer = clickTarget.parents('.openDrawer').length;
console.log('clicking ' + clickTarget + ' parents have OpenDrawer? ' + targetParentHasOpenDrawer);
if (clickTarget.hasClass('drawer-icon') == false && !clickTarget.hasClass('openDrawer')) { // don't run this check on drawer icons, as causes insta-closes
if (jQuery.find('.openDrawer').length !== 0) { // only run if opendrawers actually exist
if (targetParentHasOpenDrawer === 0) { // check if clicked target is NOT part of an OpenDrawer, and if so...
$('.openDrawer').slideToggle(200, "swing") //close all open drawers
$('.openIcon').toggleClass('closedIcon openIcon'); //set all icons to closed state
$('.openDrawer').toggleClass('closedDrawer openDrawer'); //set all drawers to closed state
}
}
}
});
})

12
public/scripts/RossAscends-mods.js
View File

@ -275,18 +275,6 @@ $("document").ready(function () {
$("#main_api").change(function () { RA_autoconnect(); }); $("#main_api").change(function () { RA_autoconnect(); });
$("#api_button").click(function () { setTimeout(RA_checkOnlineStatus, 100); }); $("#api_button").click(function () { setTimeout(RA_checkOnlineStatus, 100); });
//close the RightNav panel when user clicks outside of it or related panels (adv editing popup, or dialog popups)
$("html").click(function (e) {
if ($(NavToggle).prop("checked") &&
!$(PanelPin).prop("checked") &&
$(e.target).attr("id") !== "nav-toggle" &&
!RightNavPanel.contains(e.target) &&
!AdvancedCharDefsPopup.contains(e.target) &&
!ConfirmationPopup.contains(e.target)) {
NavToggle.click();
}
});
//save NavLock prefs and record state of the Nav being open or closed //save NavLock prefs and record state of the Nav being open or closed
$(NavToggle).on("change", function () { SaveLocal("NavOpened", $(NavToggle).prop("checked")); }); $(NavToggle).on("change", function () { SaveLocal("NavOpened", $(NavToggle).prop("checked")); });
$(PanelPin).on("change", function () { SaveLocal("NavLockOn", $(PanelPin).prop("checked")); }); $(PanelPin).on("change", function () { SaveLocal("NavLockOn", $(PanelPin).prop("checked")); });