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

Initial commit of better editing method. Has some visual bugs that need to be worked on

Browse Source
This commit is contained in:
ebolam
2022-09-14 11:58:01 -04:00
parent d124359038
commit c172ff6b0b
4 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
aiserver.py
View File

@@ -7144,7 +7144,7 @@ def UI_2_save_to_json():
#==================================================================#
@socketio.on('Set Selected Text')
def UI_2_Set_Selected_Text(data):
if koboldai_vars.quiet:
if not koboldai_vars.quiet:
print("Updating Selected Text: {}".format(data))
koboldai_vars.actions[int(data['id'])] = data['text']

3
static/koboldai.css
View File

@@ -1188,8 +1188,7 @@ body {
display: none;
}
[contenteditable="true"]:active,
[contenteditable="true"]:focus{
.editing{
border:none;
outline:none;
color: var(--text_edit);

63
static/koboldai.js
View File

@@ -48,6 +48,7 @@ var on_colab;
var colab_cookies = null;
var wi_finder_data = [];
var wi_finder_offset = 0;
var selected_game_chunk = null;
// name, desc, icon, func
const finder_actions = [
@@ -272,17 +273,8 @@ function do_story_text_updates(data) {
var span = document.createElement("span");
span.id = 'Selected Text Chunk '+data.value.id;
span.classList.add("rawtext");
span.chunk = data.value.id;
span.setAttribute("chunk", data.value.id);
span.original_text = data.value.action['Selected Text'];
span.setAttribute("contenteditable", true);
span.onblur = function () {
if (this.textContent != this.original_text) {
socket.emit("Set Selected Text", {"id": this.chunk, "text": this.textContent});
this.original_text = this.textContent;
this.classList.add("pulse");
}
}
span.onkeydown = detect_enter_text;
new_span = document.createElement("span");
new_span.textContent = data.value.action['Selected Text'];
span.append(new_span);
@@ -306,9 +298,7 @@ function do_prompt(data) {
}
span = document.createElement("span");
span2 = document.createElement("span");
span2.textContent = data.value;
span.append(span2);
span.textContent = data.value;
item.append(span);
item.setAttribute("old_text", data.value)
item.classList.remove("pulse");
@@ -2044,7 +2034,6 @@ function save_tweaks() {
setCookie("enabledTweaks", JSON.stringify(out));
}
function load_tweaks() {
let enabledTweaks = JSON.parse(getCookie("enabledTweaks", "[]"));
@@ -2075,6 +2064,52 @@ function toggle_adventure_mode(button) {
}
function select_game_text(event) {
if ((event == null) || (event.code == 'ArrowRight') || (event.code == 'ArrowLeft') || (event.code == 'ArrowDown') || (event.code == 'ArrowUp')) {
let new_selected_game_chunk = null;
if (document.selection) {
if (document.selection.createRange().parentElement().id == 'story_prompt') {
new_selected_game_chunk = document.selection.createRange().parentElement();
} else {
new_selected_game_chunk = document.selection.createRange().parentElement().parentElement();
}
} else {
if (window.getSelection().anchorNode.parentNode.id == 'story_prompt') {
new_selected_game_chunk = window.getSelection().anchorNode.parentNode;
} else {
new_selected_game_chunk = window.getSelection().anchorNode.parentNode.parentNode;
}
}
//if we've moved to a new game chunk we need to save the old chunk
if ((new_selected_game_chunk != selected_game_chunk) && (selected_game_chunk != null)) {
edit_game_text();
}
if (new_selected_game_chunk != selected_game_chunk) {
selected_game_chunk = new_selected_game_chunk
}
//set editting class
for (item of document.getElementsByClassName("editing")) {
item.classList.remove("editing");
}
selected_game_chunk.classList.add("editing");
}
}
function edit_game_text() {
if ((selected_game_chunk != null) && (selected_game_chunk.textContent != selected_game_chunk.original_text)) {
console.log("selected_chunk_id: "+selected_game_chunk.id);
console.log(selected_game_chunk);
if (selected_game_chunk.id == "story_prompt") {
sync_to_server(selected_game_chunk);
} else {
socket.emit("Set Selected Text", {"id": selected_game_chunk.getAttribute("chunk"), "text": selected_game_chunk.textContent});
}
selected_game_chunk.original_text = selected_game_chunk.textContent;
selected_game_chunk.classList.add("pulse");
}
}
//--------------------------------------------General UI Functions------------------------------------
function autoResize(element) {
element.style.height = 'auto';

6
templates/index_new.html
View File

@@ -6,7 +6,7 @@
var debug_info = {errors: []};
window.addEventListener('error', function(event) {
debug_info.push({msg: message, url: url, line: line});
// debug_info.push({msg: message, url: url, line: line});
});
</script>
<script type="module">import {encode, decode} from "./static/tokenizer.js";window.encode = encode;window.decode = decode;</script>
@@ -47,8 +47,8 @@
<!------------ Game Text Screen--------------------->
<div class="gamescreen" id="gamescreen">
<div id="disconnect_message"><center><h1>Disconnected</h1></center></div>
<div class="gametext" id="Selected Text">
<span id="story_prompt" class="var_sync_story_prompt var_sync_alt_story_prompt_length var_sync_alt_story_prompt_in_ai rawtext" contenteditable=true onblur="if (getAttribute(this, 'old_text') != this.textContent) {sync_to_server(this);}" onkeydown="detect_enter_text"></span>
<div class="gametext" id="Selected Text" contenteditable=true onblur="edit_game_text();selected_game_chunk = null;" onclick="select_game_text(null);" onkeydown="select_game_text(event);">
<span id="story_prompt" class="var_sync_story_prompt var_sync_alt_story_prompt_length var_sync_alt_story_prompt_in_ai rawtext"></span>
<span id="Delete Me">
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;