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

Replace constants with variables

Browse Source
This commit is contained in:
SillyLossy
2023-03-15 12:59:39 +02:00
parent 231ae91ae6
commit 16ac0f3a31
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/index.html
View File

@@ -639,7 +639,8 @@
<input type="file" id="avatar_upload_file" accept="image/png" name="avatar"> <input type="file" id="avatar_upload_file" accept="image/png" name="avatar">
</form> </form>
<form id='form_change_name' action="javascript:void(null);" method="post" enctype="multipart/form-data"> <form id='form_change_name' action="javascript:void(null);" method="post" enctype="multipart/form-data">
<h4>Name</h4><br> <br>
<h4>Name</h4>
<input id="your_name" name="your_name" class="text_pole" maxlength="35" value="" <input id="your_name" name="your_name" class="text_pole" maxlength="35" value=""
autocomplete="off"><br> autocomplete="off"><br>
<input id="your_name_button" class="menu_button" type="submit" <input id="your_name_button" class="menu_button" type="submit"

17
public/script.js
View File

@@ -745,7 +745,7 @@ function clearChat() {
function messageFormating(mes, ch_name, isSystem, forceAvatar) { function messageFormating(mes, ch_name, isSystem, forceAvatar) {
if (this_chid != undefined && !isSystem) if (this_chid != undefined && !isSystem)
mes = mes.replaceAll("<", "&lt;").replaceAll(">", "&gt;"); //for ***** mes = mes.replaceAll("<", "&lt;").replaceAll(">", "&gt;"); //for welcome message
if (this_chid === undefined) { if (this_chid === undefined) {
mes = mes mes = mes
.replace(/\*\*(.+?)\*\*/g, "<b>$1</b>") .replace(/\*\*(.+?)\*\*/g, "<b>$1</b>")
@@ -786,13 +786,11 @@ function addOneMessage(mes) {
var avatarImg = "User Avatars/" + user_avatar; var avatarImg = "User Avatars/" + user_avatar;
const isSystem = mes.is_system; const isSystem = mes.is_system;
generatedPromtCache = ""; generatedPromtCache = "";
//thisText = thisText.split("\n").join("<br>");
var avatarImg = "User Avatars/" + user_avatar;
if (!mes["is_user"]) { if (!mes["is_user"]) {
if (mes.force_avatar) { if (mes.force_avatar) {
avatarImg = mes.force_avatar; avatarImg = mes.force_avatar;
} else if (this_chid == undefined || this_chid == "invalid-safety-id") { } else if (this_chid == undefined || this_chid == "invalid-safety-id") {
avatarImg = "img/five.png"; avatarImg = system_avatar;
} else { } else {
if (characters[this_chid].avatar != "none") { if (characters[this_chid].avatar != "none") {
avatarImg = "characters/" + characters[this_chid].avatar; avatarImg = "characters/" + characters[this_chid].avatar;
@@ -2181,8 +2179,8 @@ async function deleteGroup(id) {
this_chid = "invalid-safety-id"; //unsets expected chid before reloading (related to getCharacters/printCharacters from using old arrays) this_chid = "invalid-safety-id"; //unsets expected chid before reloading (related to getCharacters/printCharacters from using old arrays)
selected_group = null; selected_group = null;
characters.length = 0; // resets the characters array, forcing getcharacters to reset characters.length = 0; // resets the characters array, forcing getcharacters to reset
name2 = systemUserName; // replaces deleted charcter name with *****, since she wil be displayed next. name2 = systemUserName; // replaces deleted charcter name with system user since it will be displayed next.
chat = [...safetychat]; // sets up ***** to tell user about having deleted a character chat = [...safetychat]; // sets up system user to tell user about having deleted a character
/* QuickRefresh(); */ /* QuickRefresh(); */
$("#rm_info_avatar").html(""); $("#rm_info_avatar").html("");
@@ -4028,10 +4026,9 @@ $(document).ready(function () {
//this allows for dynamic refresh of character list after deleting a character. //this allows for dynamic refresh of character list after deleting a character.
$("#character_cross").click(); // closes advanced editing popup $("#character_cross").click(); // closes advanced editing popup
this_chid = "invalid-safety-id"; // unsets expected chid before reloading (related to getCharacters/printCharacters from using old arrays) this_chid = "invalid-safety-id"; // unsets expected chid before reloading (related to getCharacters/printCharacters from using old arrays)
//avatar = "..img/*****.jpg";
characters.length = 0; // resets the characters array, forcing getcharacters to reset characters.length = 0; // resets the characters array, forcing getcharacters to reset
name2 = systemUserName; // replaces deleted charcter name with *****, since she will be displayed next. name2 = systemUserName; // replaces deleted charcter name with system user since she will be displayed next.
chat = [...safetychat]; // sets up ***** to tell user about having deleted a character chat = [...safetychat]; // sets up system user to tell user about having deleted a character
$(document.getElementById("rm_button_selected_ch")).css( $(document.getElementById("rm_button_selected_ch")).css(
"class", "class",
"deselected-right-tab" "deselected-right-tab"
@@ -4042,7 +4039,7 @@ $(document).ready(function () {
clearChat(); // removes deleted char's chat clearChat(); // removes deleted char's chat
this_chid = undefined; // prevents getCharacters from trying to load an invalid char. this_chid = undefined; // prevents getCharacters from trying to load an invalid char.
getCharacters(); // gets the new list of characters (that doesn't include the deleted one) getCharacters(); // gets the new list of characters (that doesn't include the deleted one)
printMessages(); // prints out *****'s 'deleted character' message printMessages(); // prints out system user's 'deleted character' message
//console.log("#dialogue_popup_ok(del-char) >>>> saving"); //console.log("#dialogue_popup_ok(del-char) >>>> saving");
saveSettings(); // saving settings to keep changes to variables saveSettings(); // saving settings to keep changes to variables
//getCharacters(); //getCharacters();