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

condition check menu type so that clicking on fav wont submit the create chara form

Browse Source
This commit is contained in:
Wilfred Chen
2023-04-23 02:54:57 +08:00
parent 8015f3e7cf
commit 152dc97ebe
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/script.js
View File

@ -648,7 +648,7 @@ function printCharacters() {
`<div class=character_select chid=${i} id="CharID${i}"> `<div class=character_select chid=${i} id="CharID${i}">
<div class=avatar><img src="${this_avatar}"></div> <div class=avatar><img src="${this_avatar}"></div>
<div class=ch_name>${item.name} ${item.fav ? '<i class="fa-solid fa-star fa-2xs"></i>' : ''}</div> <div class=ch_name>${item.name} ${item.fav == "true" ? '<i class="fa-solid fa-star fa-2xs"></i>' : ''}</div>
<input class="ch_fav" value=${item.fav} hidden /> <input class="ch_fav" value=${item.fav} hidden />
</div>` </div>`
); );
@ -3166,8 +3166,8 @@ function select_selected_character(chid) {
if (characters[chid].avatar != "none") { if (characters[chid].avatar != "none") {
this_avatar = getThumbnailUrl('avatar', characters[chid].avatar); this_avatar = getThumbnailUrl('avatar', characters[chid].avatar);
} }
$("#fav_checkbox").prop("checked", characters[chid].fav); $("#fav_checkbox").prop("checked", characters[chid].fav == "true");
$("#avatar_load_preview").attr("src", this_avatar); $("#avatar_load_preview").attr("src", this_avatar);
$("#name_div").css("display", "none"); $("#name_div").css("display", "none");
@ -4123,7 +4123,6 @@ $(document).ready(function () {
let save_name = create_save_name; let save_name = create_save_name;
var formData = new FormData($("#form_create").get(0)); var formData = new FormData($("#form_create").get(0));
formData.set('fav', fav_ch_checked); formData.set('fav', fav_ch_checked);
console.log(formData.get('fav'));
if ($("#form_create").attr("actiontype") == "createcharacter") { if ($("#form_create").attr("actiontype") == "createcharacter") {
if ($("#character_name_pole").val().length > 0) { if ($("#character_name_pole").val().length > 0) {
//if the character name text area isn't empty (only posible when creating a new character) //if the character name text area isn't empty (only posible when creating a new character)
@ -4298,7 +4297,9 @@ $(document).ready(function () {
$("#fav_checkbox").change(function(){ $("#fav_checkbox").change(function(){
fav_ch_checked = $(this).prop("checked"); fav_ch_checked = $(this).prop("checked");
saveCharacterDebounced(); if (menu_type != "create") {
saveCharacterDebounced();
}
}); });
$("#talkativeness_slider").on("input", function () { $("#talkativeness_slider").on("input", function () {

2
server.js
View File

@ -676,7 +676,7 @@ function checkServer() {
//***************** Main functions //***************** Main functions
function charaFormatData(data) { function charaFormatData(data) {
var char = { "name": data.ch_name, "description": data.description, "personality": data.personality, "first_mes": data.first_mes, "avatar": 'none', "chat": data.ch_name + ' - ' + humanizedISO8601DateTime(), "mes_example": data.mes_example, "scenario": data.scenario, "create_date": humanizedISO8601DateTime(), "talkativeness": data.talkativeness, "fav": data.fav ? data.fav : false }; var char = { "name": data.ch_name, "description": data.description, "personality": data.personality, "first_mes": data.first_mes, "avatar": 'none', "chat": data.ch_name + ' - ' + humanizedISO8601DateTime(), "mes_example": data.mes_example, "scenario": data.scenario, "create_date": humanizedISO8601DateTime(), "talkativeness": data.talkativeness, "fav": data.fav};
return char; return char;
} }
app.post("/createcharacter", urlencodedParser, function (request, response) { app.post("/createcharacter", urlencodedParser, function (request, response) {