From 11ca7d421a0cf77483bbdd8586ba95226bc06e59 Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Fri, 4 Nov 2022 11:31:28 -0400
Subject: [PATCH] Model welcome text positioning fix Fix for options showing up
 when scrolling

---
 aiserver.py              | 2 +-
 static/koboldai.css      | 4 +++-
 static/koboldai.js       | 4 ++++
 templates/index_new.html | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/aiserver.py b/aiserver.py
index a72e8b43..971edfe0 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -9464,7 +9464,7 @@ def UI_2_get_next_100_actions(data):
     emit("var_changed", {"classname": "story", "name": "actions", "old_value": None, "value":data_to_send})
 
 #==================================================================#
-# Get next 100 actions for infinate scroll
+# Get context tokens
 #==================================================================#
 @socketio.on("update_tokens")
 @logger.catch
diff --git a/static/koboldai.css b/static/koboldai.css
index d5a5e893..46fed158 100644
--- a/static/koboldai.css
+++ b/static/koboldai.css
@@ -2386,8 +2386,10 @@ body {
 	color: white
 }
 
-#welcome_text {
+.welcome_container {
 	height: 100%;
+	display: flex;
+	margin-top: auto;
 }
 
 .welcome_text {
diff --git a/static/koboldai.js b/static/koboldai.js
index bb06bbee..00e59b2b 100644
--- a/static/koboldai.js
+++ b/static/koboldai.js
@@ -151,6 +151,7 @@ var colab_cookie_timeout;
 var setup_missing_wi_toggles_timeout;
 var var_processing_time = 0;
 var finder_last_input;
+var current_action;
 //-----------------------------------Server to UI  Functions-----------------------------------------------
 function connect() {
 	console.log("connected");
@@ -229,6 +230,9 @@ function fix_text(val) {
 
 function create_options(action) {
 	//Set all options before the next chunk to hidden
+	if (action.id  != current_action+1) {
+		return;
+	}
 	document.getElementById('main-grid').setAttribute('option_length', action.action.Options.length);
 	var option_chunk = document.getElementById("Select Options");
 	
diff --git a/templates/index_new.html b/templates/index_new.html
index 61c82d1d..15f4893c 100644
--- a/templates/index_new.html
+++ b/templates/index_new.html
@@ -45,7 +45,7 @@
 		<!------------ Game Text Screen--------------------->
 		<div class="gamescreen" id="gamescreen">
 			<div id="disconnect_message"><center><h1>Disconnected</h1></center></div>
-			<div id="welcome_text" class="var_sync_model_welcome" draggable="False"></div>
+			<div class="welcome_container"><div id="welcome_text" class="var_sync_model_welcome" draggable="False"></div></div>
 			<div class="gametext" id="Selected Text" contenteditable=false onblur="select_game_text(null);" onclick="select_game_text(null);" onkeyup="select_game_text(event);">
 				<span id="story_prompt" class="var_sync_story_prompt var_sync_alt_story_prompt_in_ai rawtext hidden" chunk="-1"></span>
 			</div>