From 2c7cf0494ecbd12c91ca98c0eb7209d5521de53b Mon Sep 17 00:00:00 2001 From: Tai Groot Date: Fri, 9 Apr 2021 10:39:23 -0700 Subject: [PATCH] Adds autoscroll feature to browser --- browser/browser.go | 15 ++++++++++++++- main.go | 4 ++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/browser/browser.go b/browser/browser.go index 9a72d79..91218cb 100644 --- a/browser/browser.go +++ b/browser/browser.go @@ -3,10 +3,13 @@ package browser import ( "html/template" "net/http" + "strings" ) func LogSocketViewHandler(w http.ResponseWriter, r *http.Request) { - homeTemplate.Execute(w, "ws://"+r.Host+r.URL.Path+"/ws") + wsResource := "ws://" + r.Host + r.URL.Path + wsResource = strings.TrimSuffix(wsResource, "/") + "/ws" + homeTemplate.Execute(w, wsResource) } var homeTemplate = template.Must(template.New("").Parse(` @@ -18,6 +21,7 @@ var homeTemplate = template.Must(template.New("").Parse(`
+Enable Autoscroll
@@ -183,6 +187,14 @@ function filterTable() { } } +function pageScroll() { + if (document.getElementById('shouldScroll').checked) { + document.getElementById('tableWrapper').scrollBy(0,10); + + } + setTimeout(pageScroll,10); +} + document.getElementById("delete").addEventListener("click", function(){ clearTable() @@ -192,6 +204,7 @@ document.getElementById("download").addEventListener("click", function(){ download(application+'.json',JSON.stringify(logs)); }, false); openSocket(); +pageScroll(); diff --git a/main.go b/main.go index 0544f37..53ef891 100644 --- a/main.go +++ b/main.go @@ -19,14 +19,14 @@ func generateLogs() { logger.Debug("This is a debug log!") logger.Warn("This is a warn log!") logger.Error("This is an error log!") - time.Sleep(10 * time.Second) + time.Sleep(2 * time.Second) } } func main() { defer logger.Flush() flag.Parse() - http.HandleFunc("/logs", ws.LogSocketHandler) + http.HandleFunc("/ws", ws.LogSocketHandler) http.HandleFunc("/", browser.LogSocketViewHandler) go generateLogs() logger.Fatal(http.ListenAndServe(*addr, nil))