Fix JS undefined error

iobear · Feb 26, 2024 · 27dca6b · 27dca6b
1 parent 4922a2a
commit 27dca6b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Changelog
-## [v1.5.dev] - 2024-02-23
+## [v1.5.dev] - 2024-02-26
 Fix:
  - JS dashboard update error
+ - JS lowercase undefined error
 
 Change:
  - Made a common module, moved ServiceState to common for other tools

diff --git a/cmd/dashgoat/main.go b/cmd/dashgoat/main.go
@@ -11,7 +11,6 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
-	"os"
 	"strings"
 	"sync"
 
@@ -77,8 +76,11 @@ func main() {
 		config.WebPath = "/" + config.WebPath
 	}
 
+	useOS := false
 	// Serving embedded static files
-	useOS := len(os.Args) > 1 && os.Args[1] == "live"
+	// if len(os.Args) > 1 && os.Args[1] == "live" {
+	// 	useOS = true
+	// }
 	assetHandler := http.FileServer(getFileSystem(useOS))
 	e.GET("/", echo.WrapHandler(assetHandler))
 	e.GET("/*", echo.WrapHandler(http.StripPrefix("/", assetHandler)))

diff --git a/web/css/dash.css b/web/css/dash.css
@@ -45,7 +45,7 @@ body {
   flex-grow: 2;
 }
 .divTable .cellmessage {
-  flex-grow: 5;
+  flex-grow: 6;
 }
 .divTable .cellchange,
 .divTable .cellprobe,

diff --git a/web/js/dash.js b/web/js/dash.js
@@ -23,7 +23,7 @@ function createHeader()
 	{
 		let cell = document.createElement("div");
 
-		cell.setAttribute("onclick", "setSortBy(this.innerText.toLowerCase())");
+		cell.setAttribute("onclick", "setSortBy(this.innerText)");
 		dashheader.appendChild(cell).classList.add('cell'+item)
 		dashheader.appendChild(cell).innerText = item;
 	}

diff --git a/web/js/helper.js b/web/js/helper.js
@@ -84,6 +84,11 @@ function lowerCase(item)
 		return item;
 	}
 
+	if (item == undefined)
+	{
+		return item;
+	}
+
 	if (isInt(item))
 	{
 		return item;