diff --git a/public/index.html b/public/index.html index 9cfa60cc2..ccd6954bf 100644 --- a/public/index.html +++ b/public/index.html @@ -1,8 +1,6 @@ - - @@ -39,7 +37,7 @@ import {encode, decode} from "../scripts/gpt-2-3-tokenizer/mod.js"; $(document).ready(function(){ const VERSION = '1.2.8'; - var converter = new showdown.Converter(); + var converter = new showdown.Converter({emoji: 'true'}); var bg_menu_toggle = false; const systemUserName = 'Chloe'; var default_user_name = "You"; @@ -240,14 +238,10 @@ function checkOnlineStatus(){ //console.log(online_status); if(online_status == 'no_connection'){ - $("#send_textarea").attr('placeholder', "Not connected to API!"); //Input bar placeholder tells users they are not connected + $("#send_textarea").attr('placeholder', "Not connected to API!"); //Input bar placeholder tells users they are not connected $("#send_form").css("background-color", "rgba(100,0,0,0.7)"); //entire input form area is red when not connected $("#send_but").css("display", "none"); //send button is hidden when not connected - - $("#online_status_indicator").css("background-color", "red"); - $("#online_status").css("opacity", 0.3); - $("#online_status_text").html("No connection..."); $("#online_status_indicator2").css("background-color", "red"); $("#online_status_text2").html("No connection..."); $("#online_status_indicator3").css("background-color", "red"); @@ -258,11 +252,7 @@ $("#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 - - - $("#online_status_indicator").css("background-color", "black"); - $("#online_status").css("display", "none"); - $("#online_status_text").html(""); + $("#online_status_indicator2").css("background-color", "green"); $("#online_status_text2").html(online_status); $("#online_status_indicator3").css("background-color", "green"); @@ -1201,7 +1191,7 @@ mesSendString = '\nThen the roleplay chat between '+name1+' and '+name2+' begins.\n'+mesSendString; }else{ mesSendString = '\n'+mesSendString; - //mesSendString = mesSendString; + //mesSendString = mesSendString; //This edit simply removes the first "" that is prepended to all context prompts } finalPromt = worldInfoBefore+storyString+worldInfoAfter+mesExmString+mesSendString+generatedPromtCache+promptBias; @@ -1490,41 +1480,40 @@ //maybe a way to simulate this would be to disable the eventListener for people iOS. $("#send_textarea").keydown(function (e) { - if(e.which === 13 && !e.shiftKey && !e.ctrlKey && is_send_press == false) { + if(!e.shiftKey && !e.ctrlKey && e.key == "Enter" && is_send_press == false) { is_send_press = true; e.preventDefault(); Generate(); - //$(this).closest("form").submit(); } }); //RossAscends: Lets add some hotkeys document.addEventListener('keydown', (event) => { - //console.log(event.key); + if(event.ctrlKey && event.key == "Enter") { // Ctrl+Enter for Regeneration Last Response - //console.log('both CTRL and Enter were pressed'); + if(is_send_press == false){ is_send_press = true; Generate('regenerate'); - //console.log('confirmed keypress was caught '+ event.key); } }else if(event.ctrlKey && event.key == "ArrowUp") { //Ctrl+UpArrow for Connect to last server + document.getElementById('api_button').click(); } }); - //menu buttons - var selected_button_style = { color: "#bcc1c8" }; - var deselected_button_style = { color: "#565d66" }; - $( "#rm_button_create" ).children("h2").css(selected_button_style); - $( "#rm_button_characters" ).children("h2").css(selected_button_style); + //menu buttons setup + var selected_button_style = { }; + var deselected_button_style = { }; + + $( "#rm_button_create" ).css("class","deselected-right-tab"); + $( "#rm_button_characters" ).css("class","deselected-right-tab"); $( "#rm_button_settings" ).click(function() { selected_button = 'settings'; menu_type = 'settings'; $( "#rm_characters_block" ).css("display", "none"); $( "#rm_api_block" ).css("display", "block"); - $('#rm_api_block').css('opacity',0.0); $('#rm_api_block').transition({ opacity: 1.0, @@ -1535,10 +1524,9 @@ $( "#rm_ch_create_block" ).css("display", "none"); $( "#rm_info_block" ).css("display", "none"); - - $( "#rm_button_characters" ).children("h2").css(deselected_button_style); - $( "#rm_button_settings" ).children("h2").css(selected_button_style); - $( "#rm_button_selected_ch" ).children("h2").css(deselected_button_style); + $( "#rm_button_characters" ).css("class","deselected-right-tab"); + $( "#rm_button_settings" ).css("class","selected-right-tab"); + $( "#rm_button_selected_ch" ).css("class","deselected-right-tab"); }); $( "#rm_button_characters" ).click(function() { selected_button = 'characters'; @@ -1582,9 +1570,9 @@ $("#create_button").css("display", "block"); $("#create_button").attr("value", "Create"); $('#result_info').html(' '); - $( "#rm_button_characters" ).children("h2").css(deselected_button_style); - $( "#rm_button_settings" ).children("h2").css(deselected_button_style); - $( "#rm_button_selected_ch" ).children("h2").css(deselected_button_style); + $( "#rm_button_characters" ).css("class","deselected-right-tab"); + $( "#rm_button_settings" ).css("class","deselected-right-tab"); + $( "#rm_button_selected_ch" ).css("class","deselected-right-tab"); //create text poles $("#rm_button_back").css("display", "inline-block"); @@ -1622,9 +1610,9 @@ $( "#rm_ch_create_block" ).css("display", "none"); $( "#rm_info_block" ).css("display", "none"); - $( "#rm_button_characters" ).children("h2").css(selected_button_style); - $( "#rm_button_settings" ).children("h2").css(deselected_button_style); - $( "#rm_button_selected_ch" ).children("h2").css(deselected_button_style); + $( "#rm_button_characters" ).css("class","selected-right-tab"); + $( "#rm_button_settings" ).css("class","deselected-right-tab"); + $( "#rm_button_selected_ch" ).css("class","deselected-right-tab"); } function select_rm_info(text){ $( "#rm_characters_block" ).css("display", "none"); @@ -1634,9 +1622,9 @@ $("#rm_info_text").html('

'+text+'

'); - $( "#rm_button_characters" ).children("h2").css(deselected_button_style); - $( "#rm_button_settings" ).children("h2").css(deselected_button_style); - $( "#rm_button_selected_ch" ).children("h2").css(deselected_button_style); + $( "#rm_button_characters" ).css("class","deselected-right-tab"); + $( "#rm_button_settings" ).css("class","deselected-right-tab"); + $( "#rm_button_selected_ch" ).css("class","deselected-right-tab"); } function select_selected_character(chid){ //character select @@ -1644,7 +1632,7 @@ select_rm_create(); menu_type = 'character_edit'; $( "#delete_button_div" ).css("display", "block"); - $( "#rm_button_selected_ch" ).children("h2").css(selected_button_style); + $( "#rm_button_selected_ch" ).css("class","selected-right-tab"); var display_name = characters[chid].name; $( "#rm_button_selected_ch" ).children("h2").text(display_name); @@ -3927,12 +3915,13 @@