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

Fix async race condition in message editor

Browse Source
This commit is contained in:
SillyLossy
2023-05-31 02:09:08 +03:00
parent 747567466f
commit cdaa14964e
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
public/script.js
View File

@ -4021,8 +4021,8 @@ function setCharacterBlockHeight() {
// Common code for message editor done and auto-save // Common code for message editor done and auto-save
function updateMessage(div) { function updateMessage(div) {
let mesBlock = div.closest(".mes_block"); const mesBlock = div.closest(".mes_block");
var text = mesBlock.find(".edit_textarea").val().trim(); const text = mesBlock.find(".edit_textarea").val().trim();
const bias = extractMessageBias(text); const bias = extractMessageBias(text);
const mes = chat[this_edit_mes_id]; const mes = chat[this_edit_mes_id];
mes["mes"] = text; mes["mes"] = text;
@ -4078,7 +4078,7 @@ async function messageEditDone(div) {
await eventSource.emit(event_types.MESSAGE_EDITED, this_edit_mes_id); await eventSource.emit(event_types.MESSAGE_EDITED, this_edit_mes_id);
this_edit_mes_id = undefined; this_edit_mes_id = undefined;
saveChatConditional(); await saveChatConditional();
} }
async function getPastCharacterChats() { async function getPastCharacterChats() {
@ -6265,7 +6265,7 @@ $(document).ready(function () {
//******************** //********************
//***Message Editor*** //***Message Editor***
$(document).on("click", ".mes_edit", function () { $(document).on("click", ".mes_edit", async function () {
if (this_chid !== undefined || selected_group) { if (this_chid !== undefined || selected_group) {
// Previously system messages we're allowed to be edited // Previously system messages we're allowed to be edited
/*const message = $(this).closest(".mes"); /*const message = $(this).closest(".mes");
@ -6276,12 +6276,8 @@ $(document).ready(function () {
let chatScrollPosition = $("#chat").scrollTop(); let chatScrollPosition = $("#chat").scrollTop();
if (this_edit_mes_id !== undefined) { if (this_edit_mes_id !== undefined) {
let mes_edited = $("#chat") let mes_edited = $(`#chat [mesid="${this_edit_mes_id}"]`).find(".mes_edit_done");
.children() if (Number(edit_mes_id) == count_view_mes - 1) { //if the generating swipe (...)
.filter('[mesid="' + this_edit_mes_id + '"]')
.find(".mes_block")
.find(".mes_edit_done");
if (edit_mes_id == count_view_mes - 1) { //if the generating swipe (...)
if (chat[edit_mes_id]['swipe_id'] !== undefined) { if (chat[edit_mes_id]['swipe_id'] !== undefined) {
if (chat[edit_mes_id]['swipes'].length === chat[edit_mes_id]['swipe_id']) { if (chat[edit_mes_id]['swipes'].length === chat[edit_mes_id]['swipe_id']) {
run_edit = false; run_edit = false;
@ -6291,7 +6287,7 @@ $(document).ready(function () {
hideSwipeButtons(); hideSwipeButtons();
} }
} }
messageEditDone(mes_edited); await messageEditDone(mes_edited);
} }
$(this).closest(".mes_block").find(".mes_text").empty(); $(this).closest(".mes_block").find(".mes_text").empty();
$(this).closest(".mes_block").find(".mes_buttons").css("display", "none"); $(this).closest(".mes_block").find(".mes_buttons").css("display", "none");
@ -6462,8 +6458,8 @@ $(document).ready(function () {
showSwipeButtons(); showSwipeButtons();
}); });
$(document).on("click", ".mes_edit_done", function () { $(document).on("click", ".mes_edit_done", async function () {
messageEditDone($(this)); await messageEditDone($(this));
}); });
$("#your_name_button").click(function () { $("#your_name_button").click(function () {