rixty/KoboldAI-Client
1
1
Fork 0
mirror of https://github.com/KoboldAI/KoboldAI-Client.git synced 2025-06-05 21:59:24 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #426 from one-some/small-shift-fix

Browse Source 
UI: Replace shift_down code with builtin event.shiftKey
This commit is contained in:
henk717
2023-08-06 23:48:41 +02:00
committed by GitHub
parent 6e47215e84 0f88d520ed
commit 4f0945e5dc
1 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
static/koboldai.js
View File

@@ -65,7 +65,6 @@ var rename_return_emit_name = "popup_rename";
var popup_rows = [];
var popup_style = "";
var popup_sort = {};
var shift_down = false;
var world_info_data = {};
var world_info_folder_data = {};
var saved_settings = {};
@@ -5041,49 +5040,44 @@ function getCookie(cname, default_return=null) {
}
function detect_enter_submit(e) {
if (((e.code == "Enter") || (e.code == "NumpadEnter")) && !(shift_down)) {
if (typeof e.stopPropagation != "undefined") {
e.stopPropagation();
} else {
e.cancelBubble = true;
}
//console.log("submitting");
document.getElementById("btnsubmit").onclick();
setTimeout(function() {document.getElementById('input_text').value = '';}, 1);
if (e.shiftKey) return;
if (!["Enter", "NumpadEnter"].includes(e.key)) return;
if (typeof e.stopPropagation != "undefined") {
e.stopPropagation();
} else {
e.cancelBubble = true;
}
//console.log("submitting");
document.getElementById("btnsubmit").onclick();
setTimeout(function() {document.getElementById('input_text').value = '';}, 1);
}
function detect_enter_text(e) {
if (((e.code == "Enter") || (e.code == "NumpadEnter")) && !(shift_down)) {
if (typeof e.stopPropagation != "undefined") {
e.stopPropagation();
} else {
e.cancelBubble = true;
}
//get element
//console.log("Doing Text Enter");
//console.log(e.currentTarget.activeElement);
if (e.currentTarget.activeElement != undefined) {
var item = $(e.currentTarget.activeElement);
item.onchange();
}
if (e.shiftKey) return;
if (!["Enter", "NumpadEnter"].includes(e.key)) return;
if (typeof e.stopPropagation != "undefined") {
e.stopPropagation();
} else {
e.cancelBubble = true;
}
//get element
//console.log("Doing Text Enter");
//console.log(e.currentTarget.activeElement);
if (e.currentTarget.activeElement != undefined) {
var item = $(e.currentTarget.activeElement);
item.onchange();
}
}
function detect_key_down(e) {
if ((e.code == "ShiftLeft") || (e.code == "ShiftRight")) {
shift_down = true;
} else if (e.code == "Escape") {
if (e.code == "Escape") {
close_menus();
}
}
function detect_key_up(e) {
if ((e.code == "ShiftLeft") || (e.code == "ShiftRight")) {
shift_down = false;
}
}
function selectTab(tab) {
let tabTarget = document.getElementById(tab.getAttribute("tab-target"));
let tabClass = Array.from(tab.classList).filter((c) => c.startsWith("tab-"))[0];
@@ -6064,7 +6058,6 @@ function openClubImport() {
//// INIT ////
document.onkeydown = detect_key_down;
document.onkeyup = detect_key_up;
document.getElementById("input_text").onkeydown = detect_enter_submit;
/* -- Popups -- */