From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 26 Nov 2020 21:21:32 +0000 (+0000)
Subject: fix scroll
X-Git-Tag: otter-0.2.0~350
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c5717cb0e901b1349ae8599b4a0160fe3bf71e88;p=otter.git

fix scroll

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

diff --git a/templates/landscape.tera b/templates/landscape.tera
index f943d350..2c573e21 100644
--- a/templates/landscape.tera
+++ b/templates/landscape.tera
@@ -45,7 +45,7 @@
       </div>
 	{{ m::uos() }}
 
-<div id="logouter">
+<div>
   <div id="log" style="overflow-y: scroll; height: 600px;">
   {% for ent in log %}
     <div>
diff --git a/templates/script.ts b/templates/script.ts
index 57bc9fea..ff73a441 100644
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -865,9 +865,7 @@ function add_timestamped_log_message(ts_html: string, msg_html: string) {
   log_elem.appendChild(ne);
 
   if (!in_scrollback) {
-    let by = ne.getBoundingClientRect()!.height;
-    lastent = log_elem.lastElementChild!;
-    logscroll_elem.scrollBy(0, by);
+    logscroll_elem.scrollTop = logscroll_elem.scrollHeight;
   }
 }
 
@@ -1088,8 +1086,8 @@ function startup() {
   let sse_url_prefix = body.dataset.sseUrlPrefix!;
   status_node = document.getElementById('status')!;
   status_node.innerHTML = 'js-done';
-  logscroll_elem = document.getElementById("logscroll") || log_elem;
   log_elem = document.getElementById("log")!;
+  logscroll_elem = document.getElementById("logscroll") || log_elem;
   let dataload = JSON.parse(body.dataset.load!);
   players = dataload.players!;
   delete body.dataset.load;