From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 26 Nov 2020 18:59:55 +0000 (+0000)
Subject: fix log scrolling to only scroll when desired
X-Git-Tag: otter-0.2.0~354
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e041a9bdf61bc1353cb10ea2f7f5a07f9e00b30e;p=otter.git

fix log scrolling to only scroll when desired

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/templates/landscape.tera b/templates/landscape.tera
index 157e8def..79b418b7 100644
--- a/templates/landscape.tera
+++ b/templates/landscape.tera
@@ -45,6 +45,7 @@
       </div>
 	{{ m::uos() }}
 
+<div id="logouter">
   <div id="log" style="overflow-y: scroll; height: 600px;">
   {% for ent in log %}
     <div>
@@ -55,5 +56,6 @@
   </div>
 </div>
 </div>
+</div>
 
 {{ m::footer() }}
diff --git a/templates/script.ts b/templates/script.ts
index ebfefcb4..377a8144 100644
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -110,6 +110,7 @@ var space : SVGGraphicsElement;
 var pieces_marker : SVGGraphicsElement;
 var defs_marker : SVGGraphicsElement;
 var log_elem : HTMLElement;
+var logouter_elem : HTMLElement;
 var status_node : HTMLElement;
 var uos_node : HTMLElement;
 var wresting: boolean;
@@ -831,7 +832,7 @@ function add_timestamped_log_message(ts_html: string, msg_html: string) {
       (() => {
 	let le_top = lastent.getBoundingClientRect()!.top;
 	let le_bot = lastent.getBoundingClientRect()!.bottom;
-	let ld_bot = log_elem.getBoundingClientRect()!.bottom;
+	let ld_bot = logouter_elem.getBoundingClientRect()!.bottom;
 	console.log("ADD_LOG_MESSAGE bboxes: le t b, bb",
 		    le_top, le_bot, ld_bot);
 	return 0.5 * (le_bot + le_top) > ld_bot;
@@ -1086,6 +1087,7 @@ function startup() {
   let sse_url_prefix = body.dataset.sseUrlPrefix!;
   status_node = document.getElementById('status')!;
   status_node.innerHTML = 'js-done';
+  logouter_elem = document.getElementById("logouter")!;
   log_elem = document.getElementById("log")!;
   let dataload = JSON.parse(body.dataset.load!);
   players = dataload.players!;
diff --git a/templates/session.tera b/templates/session.tera
index 32d67b48..84e568e7 100644
--- a/templates/session.tera
+++ b/templates/session.tera
@@ -39,6 +39,7 @@
 <p>{{ m::uos() }}
 
 <p>
+<div id="logouter">
   <div style="overflow-y: scroll; height: 200px;">
     <table id="log">
       {% for ent in log %}
@@ -46,5 +47,6 @@
       {%- endfor %}
     </table>
   </div>
+</div>
 
 {{ m::footer() }}