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

swapped auto-function execution order

Browse Source 
testing in firefox showed connecting to API first caused a very small amount of lag which caused it to skip the auto-load-chat feature.

swapping the order and placing auto-connect at the end of getSettings fixed this.
This commit is contained in:
RossAsscends
2023-03-04 05:40:13 +09:00
parent 569ca97b13
commit 507cddcba7
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
public/index.html
View File

@@ -2253,7 +2253,7 @@
/////////////////////////////////////////// ///////////////////////////////////////////
async function getSettings(type){//timer async function getSettings(type){//timer
//console.log('getSettings() pinging server for settings request'); //console.log('getSettings() pinging server for settings request');
jQuery.ajax({ jQuery.ajax({
type: 'POST', type: 'POST',
url: '/getsettings', url: '/getsettings',
@@ -2267,12 +2267,9 @@
contentType: "application/json", contentType: "application/json",
//processData: false, //processData: false,
success: function(data){ success: function(data){
// console.log('processing loaded settings');
if(data.result != 'file not find'){ if(data.result != 'file not find'){
// console.log('getSettings() -- settings file found');
settings = JSON.parse(data.settings); settings = JSON.parse(data.settings);
if(settings.username !== undefined){ if(settings.username !== undefined){
// console.log('getSettings() -- Username -- '+settings.username);
if(settings.username !== ''){ if(settings.username !== ''){
name1 = settings.username; name1 = settings.username;
$('#your_name').val(name1); $('#your_name').val(name1);
@@ -2337,15 +2334,14 @@
if(settings.anchor_order !== undefined) anchor_order = parseInt(settings.anchor_order); if(settings.anchor_order !== undefined) anchor_order = parseInt(settings.anchor_order);
if(settings.style_anchor !== undefined) style_anchor = !!settings.style_anchor; if(settings.style_anchor !== undefined) style_anchor = !!settings.style_anchor;
if(settings.character_anchor !== undefined) character_anchor = !!settings.character_anchor; if(settings.character_anchor !== undefined) character_anchor = !!settings.character_anchor;
//load poweruser options //load poweruser options
if(settings.auto_connect !== undefined) auto_connect = !!settings.auto_connect; if(settings.auto_connect !== undefined) auto_connect = !!settings.auto_connect;
if(settings.auto_load_chat !== undefined) auto_load_chat = !!settings.auto_load_chat; if(settings.auto_load_chat !== undefined) auto_load_chat = !!settings.auto_load_chat;
rep_pen = settings.rep_pen; rep_pen = settings.rep_pen;
rep_pen_size = settings.rep_pen_size; rep_pen_size = settings.rep_pen_size;
var addZeros = ""; var addZeros = "";
if(isInt(temp)) addZeros = ".00"; if(isInt(temp)) addZeros = ".00";
$('#temp').val(temp); $('#temp').val(temp);
@@ -2373,7 +2369,6 @@
$('#rep_pen_size_counter').html(rep_pen_size+" Tokens"); $('#rep_pen_size_counter').html(rep_pen_size+" Tokens");
//Novel //Novel
temp_novel = settings.temp_novel; temp_novel = settings.temp_novel;
rep_pen_novel = settings.rep_pen_novel; rep_pen_novel = settings.rep_pen_novel;
rep_pen_size_novel = settings.rep_pen_size_novel; rep_pen_size_novel = settings.rep_pen_size_novel;
@@ -2416,6 +2411,7 @@
} }
//Load User's Name and Avatar //Load User's Name and Avatar
user_avatar = settings.user_avatar; user_avatar = settings.user_avatar;
$('.mes').each(function(){ $('.mes').each(function(){
if($(this).attr('ch_name') == name1){ if($(this).attr('ch_name') == name1){
@@ -2426,27 +2422,26 @@
//Load the API server URL from settings //Load the API server URL from settings
api_server = settings.api_server; api_server = settings.api_server;
$('#api_url_text').val(api_server); $('#api_url_text').val(api_server);
//RossAscends: auto-connect to last API function (fires when API URL exists in settings and auto_connect is true)
if(api_server !== ''&& auto_connect == true){
$('#api_button').click();
}
} }
//RossAscends: auto-load last character function (fires when active_character is defined and auto_load_chat is true) //RossAscends: auto-load last character function (fires when active_character is defined and auto_load_chat is true)
if(settings.active_character !== undefined){ if(settings.active_character !== undefined){
//console.log('getSettings() -- active_character -- '+settings.active_character);
if(settings.active_character !== ''){ if(settings.active_character !== ''){
active_character = settings.active_character; active_character = settings.active_character;
//console.log('getSettings() -- auto_load_chat -- '+auto_load_chat);
if (auto_load_chat == true){ if (auto_load_chat == true){
//console.log('getSettings() - trying to click .character_select div with ID #CharID'+active_character);
$('#CharID'+active_character).click(); //will auto-select and load chat of last selected character is auto_load_chat is true $('#CharID'+active_character).click(); //will auto-select and load chat of last selected character is auto_load_chat is true
} }
} }
} }
//RossAscends: auto-connect to last API function (fires when API URL exists in settings and auto_connect is true)
if(api_server !== ''&& auto_connect == true){
$('#api_button').click();
}
if(!is_checked_colab) isColab(); if(!is_checked_colab) isColab();
}, },
error: function (jqXHR, exception) { error: function (jqXHR, exception) {
console.log(exception); console.log(exception);