Merge pull request #298 from xkenmon/master

GitSquared · web-flow · commit e15ca7299070 · 2018-11-27T08:46:40.000+01:00
add ping addr config and city display
diff --git a/src/classes/netstat.class.js b/src/classes/netstat.class.js
@@ -89,7 +89,7 @@ class Netstat {
                     });
                 }
 
-                this.si.inetLatency("1.1.1.1", (data) => {
+                this.si.inetLatency(window.settings.pingAddr || "1.1.1.1", (data) => {
                     let ping;
                     if (data === -1) {
                         ping = "--ms";

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ class Netstat {`
`89`	`89`	`});`
`90`	`90`	`}`
`91`	`91`
`92`		`- this.si.inetLatency("1.1.1.1", (data) => {`
	`92`	`+ this.si.inetLatency(window.settings.pingAddr \|\| "1.1.1.1", (data) => {`
`93`	`93`	`let ping;`
`94`	`94`	`if (data === -1) {`
`95`	`95`	`ping = "--ms";`