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

25
public/script.js
View File

@ -1053,7 +1053,7 @@ async function Generate(type, automatic_trigger, force_name2) {//encode("dsfs").
if (main_api === 'openai') {
const oai_chat = [...chat];
if (type == 'swipe') {
if (type == 'swipe') {
oai_chat.pop();
}
@ -1797,11 +1797,11 @@ function getChatResult() {
select_selected_character(this_chid);
}
function openNavToggle() {
/* function openNavToggle() {
if (!$("#nav-toggle").prop("checked")) {
$("#nav-toggle").trigger("click");
}
}
} */
////////// OPTIMZED MAIN API CHANGE FUNCTION ////////////
@ -4062,4 +4062,21 @@ $(document).ready(function () {
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
}
}
}
});
})