From e963fbf4e0b1620fc442c27d0e45685a887e1be8 Mon Sep 17 00:00:00 2001
From: Toakan <tdaykin@live.co.uk>
Date: Thu, 15 Feb 2018 09:16:48 +0000
Subject: [PATCH] Modified Taillog to prevent offscreen scrolling.

Signed-off-by: Toakan <tdaykin@live.co.uk>
---
 scripts/pi-hole/js/taillog-FTL.js | 11 ++++++-----
 scripts/pi-hole/js/taillog.js     | 11 ++++++-----
 taillog-FTL.php                   |  2 +-
 taillog.php                       |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/scripts/pi-hole/js/taillog-FTL.js b/scripts/pi-hole/js/taillog-FTL.js
index cbe709b5..2645badf 100644
--- a/scripts/pi-hole/js/taillog-FTL.js
+++ b/scripts/pi-hole/js/taillog-FTL.js
@@ -14,14 +14,15 @@ function reloadData(){
     clearTimeout(timer);
     $.getJSON("scripts/pi-hole/php/tailLog.php?FTL&offset="+offset, function (data)
     {
-        offset = data["offset"];
         pre.append(data["lines"]);
+
+        if(scrolling && offset !== data["offset"]) {
+            pre.scrollTop(pre[0].scrollHeight);
+        }
+
+        offset = data["offset"];
     });
 
-    if(scrolling)
-    {
-        window.scrollTo(0,document.body.scrollHeight);
-    }
     timer = setTimeout(reloadData, interval);
 }
 
diff --git a/scripts/pi-hole/js/taillog.js b/scripts/pi-hole/js/taillog.js
index 7e3b2dc3..153bd18d 100644
--- a/scripts/pi-hole/js/taillog.js
+++ b/scripts/pi-hole/js/taillog.js
@@ -14,14 +14,15 @@ function reloadData(){
     clearTimeout(timer);
     $.getJSON("scripts/pi-hole/php/tailLog.php?offset="+offset, function (data)
     {
-        offset = data["offset"];
         pre.append(data["lines"]);
+
+        if(scrolling && offset !== data["offset"]) {
+            pre.scrollTop(pre[0].scrollHeight);
+        }
+
+        offset = data["offset"];
     });
 
-    if(scrolling)
-    {
-        window.scrollTo(0,document.body.scrollHeight);
-    }
     timer = setTimeout(reloadData, interval);
 }
 
diff --git a/taillog-FTL.php b/taillog-FTL.php
index 3c27cdcd..53b454ad 100644
--- a/taillog-FTL.php
+++ b/taillog-FTL.php
@@ -13,7 +13,7 @@
 </div>
 
 <div class="checkbox"><label><input type="checkbox" name="active" checked id="chk1"> Automatic scrolling on update</label></div>
-<pre id="output" style="width: 100%; height: 100%;"></pre>
+<pre id="output" style="width: 100%; height: 100%; max-height:650px; overflow-y:scroll;"></pre>
 <div class="checkbox"><label><input type="checkbox" name="active" checked id="chk2"> Automatic scrolling on update</label></div>
 
 <?php
diff --git a/taillog.php b/taillog.php
index 126648d2..895cba56 100644
--- a/taillog.php
+++ b/taillog.php
@@ -13,7 +13,7 @@
 </div>
 
 <div class="checkbox"><label><input type="checkbox" name="active" checked id="chk1"> Automatic scrolling on update</label></div>
-<pre id="output" style="width: 100%; height: 100%;"></pre>
+<pre id="output" style="width: 100%; height: 100%; max-height:650px; overflow-y:scroll;"></pre>
 <div class="checkbox"><label><input type="checkbox" name="active" checked id="chk2"> Automatic scrolling on update</label></div>
 
 <?php