rixty
/
KoboldAI-Client
mirror of https://github.com/KoboldAI/KoboldAI-Client.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Prevent aiserver.py from rarely editing the wrong chunk

This commit is contained in:
Gnome Ann 2021-08-23 18:26:38 -04:00
parent 7ce5b120a0
commit a907c0a554
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
static/application.js
View File

@ -68,7 +68,7 @@ var gamestarted = false;
var editmode = false; var editmode = false;
var connected = false; var connected = false;
var newly_loaded = true; var newly_loaded = true;
var current_chunk_changed = false; var current_editing_chunk = null;
var chunk_conflict = false; var chunk_conflict = false;
// Key states // Key states
@ -622,7 +622,7 @@ function setadventure(state) {
function autofocus(event) { function autofocus(event) {
if(connected) { if(connected) {
current_chunk_changed = true; current_editing_chunk = event.target;
event.target.focus(); event.target.focus();
} else { } else {
event.preventDefault(); event.preventDefault();
@ -635,7 +635,7 @@ function chunkOnKeyDown(event) {
if(event.keyCode == 27 || (!event.shiftKey && event.keyCode == 13)) { if(event.keyCode == 27 || (!event.shiftKey && event.keyCode == 13)) {
setTimeout(function () { setTimeout(function () {
event.target.blur(); event.target.blur();
}, 25); }, 5);
event.preventDefault(); event.preventDefault();
return; return;
} }
@ -717,7 +717,7 @@ function chunkOnKeyDown(event) {
function submitEditedChunk(event) { function submitEditedChunk(event) {
// Don't do anything if the current chunk hasn't been edited or if someone // Don't do anything if the current chunk hasn't been edited or if someone
// else overwrote it while you were busy lollygagging // else overwrote it while you were busy lollygagging
if(!current_chunk_changed || chunk_conflict) { if(current_editing_chunk === null || chunk_conflict) {
chunk_conflict = false; chunk_conflict = false;
return; return;
} }
@ -727,8 +727,10 @@ function submitEditedChunk(event) {
if(document.activeElement.tagName == "CHUNK") { if(document.activeElement.tagName == "CHUNK") {
document.activeElement.blur(); document.activeElement.blur();
} }
}, 25); }, 5);
current_chunk_changed = false;
chunk = current_editing_chunk;
current_editing_chunk = null;
// Enter edit mode if we aren't already in edit mode // Enter edit mode if we aren't already in edit mode
if(!editmode) { if(!editmode) {
@ -736,9 +738,9 @@ function submitEditedChunk(event) {
} }
// Submit the edited chunk if it's not empty, otherwise delete it // Submit the edited chunk if it's not empty, otherwise delete it
socket.send({'cmd': 'editline', 'data': event.target.getAttribute("n")}); socket.send({'cmd': 'editline', 'data': chunk.getAttribute("n")});
if(event.target.innerText.length) { if(chunk.innerText.length) {
socket.send({'cmd': 'submit', 'data': event.target.innerText}); socket.send({'cmd': 'submit', 'data': chunk.innerText});
} else { } else {
socket.send({'cmd': 'delete', 'data': ''}); socket.send({'cmd': 'delete', 'data': ''});
} }