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

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

@ -234,12 +234,12 @@ function RA_autoconnect() {
RA_AC_retries = 1;
}
break;
case 'openai':
if (oai_settings.api_key_openai) {
$("#api_button_openai").click();
retry_delay = 100;
RA_AC_retries = 1;
}
case 'openai':
if (oai_settings.api_key_openai) {
$("#api_button_openai").click();
retry_delay = 100;
RA_AC_retries = 1;
}
}
if (!connection_made) {
@ -275,18 +275,6 @@ $("document").ready(function () {
$("#main_api").change(function () { RA_autoconnect(); });
$("#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
$(NavToggle).on("change", function () { SaveLocal("NavOpened", $(NavToggle).prop("checked")); });
$(PanelPin).on("change", function () { SaveLocal("NavLockOn", $(PanelPin).prop("checked")); });