diff --git a/public/script.js b/public/script.js index 70f457d5d..f149b1e8c 100644 --- a/public/script.js +++ b/public/script.js @@ -312,7 +312,10 @@ function checkOnlineStatus() { } else { $("#send_textarea").attr("placeholder", "Type a message..."); //on connect, placeholder tells user to type message $("#send_form").css("background-color", "rgba(0,0,0,0.7)"); //on connect, form BG changes to transprent black - $("#send_but").css("display", "inline"); //on connect, send button shows up + + if (!is_send_press) { + $("#send_but").css("display", "inline"); //on connect, send button shows up + } $("#online_status_indicator2").css("background-color", "green"); $("#online_status_text2").html(online_status); @@ -1888,7 +1891,6 @@ function changeMainAPI() { $("#max_context_block").css("display", "block"); $("#amount_gen_block").css("display", "block"); $("#softprompt_block").css("display", "block"); - $("#settings_perset").trigger("change"); } if ($("#main_api").find(":selected").val() == "textgenerationwebui") { $("#kobold_api").css("display", "none"); @@ -2126,13 +2128,8 @@ async function getSettings(type) { $("#amount_gen_block").css("opacity", 0.45); } else { if (typeof koboldai_setting_names[preset_settings] !== "undefined") { - $( - "#settings_perset option[value=" + - koboldai_setting_names[preset_settings] + - "]" - ) - .attr("selected", "true") - .trigger("change"); + $(`#settings_perset option[value=${koboldai_setting_names[preset_settings]}]`) + .attr("selected", "true"); } else { $("#range_block").children().prop("disabled", true); $("#range_block").css("opacity", 0.5); diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js index d9dffa91a..894a056ad 100644 --- a/public/scripts/RossAscends-mods.js +++ b/public/scripts/RossAscends-mods.js @@ -191,7 +191,10 @@ function RA_checkOnlineStatus() { if (online_status !== undefined && online_status !== "no_connection") { $("#send_textarea").attr("placeholder", "Type a message..."); //on connect, placeholder tells user to type message $("#send_form").css("background-color", "rgba(0,0,0,0.7)"); //on connect, form BG changes to transprent black - $("#send_but").css("display", "inline"); //on connect, send button shows + + if (!is_send_press) { + $("#send_but").css("display", "inline"); //on connect, send button shows + } } } } diff --git a/public/style.css b/public/style.css index e9ee5063f..ad22be053 100644 --- a/public/style.css +++ b/public/style.css @@ -251,6 +251,7 @@ code { background: url('img/load.svg') no-repeat; background-size: 26px 26px; background-position: center center; + order: 99999; } #options_button {