Merge pull request #2940 from FriedCaper/dont-send-while-editing Keyboard shortcut related fixes

ac8a3815011012608ccef2345eff093da0ecabaa

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed
Parents: 1278b5c309b30d14f743a4720d453cd76f8f1f64 1b3db273891c1ba8c781d2f691ad2e41937ca2aa
2 files changed, +4 -0Ignore whitespace
public/script.js+3 -0
@@ -1885,6 +1885,7 @@ export async function reloadCurrentChat() {
18851885export async function sendTextareaMessage() {
18861886 if (is_send_press) return;
18871887 if (isExecutingCommandsFromChatInput) return;
1888+ if (this_edit_mes_id) return; // don't proceed if editing a message
18881889
18891890 let generateType;
18901891 // "Continue on send" is activated when the user hits "send" (or presses enter) on an empty chat box, and the last
@@ -10002,6 +10003,8 @@ jQuery(async function () {
1000210003 }
1000310004
1000410005 else if (id == 'option_continue') {
10006+ if (this_edit_mes_id) return; // don't proceed if editing a message
10007+
1000510008 if (is_send_press == false || fromSlashCommand) {
1000610009 is_send_press = true;
1000710010 Generate('continue', buildOrFillAdditionalArgs());
public/scripts/RossAscends-mods.js+1 -0
@@ -1027,6 +1027,7 @@ export function initRossMods() {
10271027 const editMesDone = $('.mes_edit_done:visible');
10281028 if (editMesDone.length > 0) {
10291029 console.debug('Accepting edits with Ctrl+Enter');
1030+ $('#send_textarea').focus();
10301031 editMesDone.trigger('click');
10311032 return;
10321033 } else if (is_send_press == false) {