Code improvements

stevetrease · stevetrease · commit ae4b33d6d780 · 2016-03-14T11:31:13.000Z
diff --git a/homemon-server/public/javascripts/genericlist.js b/homemon-server/public/javascripts/genericlist.js
@@ -17,7 +17,7 @@ socket.on('data', function(data) {
 
                 // itertate through table to find out where to insert row in alpha order
                 var count = 1;
-                if (document.getElementById("messagetable").rows.length != 1) {
+                if (document.getElementById("messagetable").rows.length !== 1) {
                         for (i = 1; i < document.getElementById("messagetable").rows.length; i++) {
                                 var row = table.rows[i];
                                 var col = row.cells[0];
@@ -30,7 +30,7 @@ socket.on('data', function(data) {
                 var row=table.insertRow(count);
                 var cell=row.insertCell(0);
                 cell.id = data.topic;
-                var cell=row.insertCell(0);
+                cell=row.insertCell(0);
                 cell.id = data.topic + "name";
                 document.getElementById(data.topic).style.textAlign="right"
                 document.getElementById(data.topic).style.wordWrap="normal"
diff --git a/homemon-server/public/javascripts/power.js b/homemon-server/public/javascripts/power.js
@@ -5,7 +5,6 @@ BeginsWith = function(needle, haystack) {
 	return (haystack.substr(0, needle.length) == needle);
 }
 
-var myvalues = [];
 var updates = 0;
 
 var socket = io.connect("http://homemon.trease.eu:8500/");
diff --git a/homemon-server/public/javascripts/powerbar.js b/homemon-server/public/javascripts/powerbar.js
@@ -2,7 +2,7 @@ ElementExists = function(id) {
 	return !!document.getElementById(id);
 };
 BeginsWith = function(needle, haystack) {
-	return (haystack.substr(0, needle.length) == needle);
+	return (haystack.substr(0, needle.length) === needle);
 }
 
 // Load the Visualization API and the piechart package.
diff --git a/homemon-server/public/javascripts/sensors.js b/homemon-server/public/javascripts/sensors.js
@@ -8,7 +8,6 @@ String.prototype.beginsWith = function (string) {
 };
 
 
-var myvalues = [];
 var updates = 0;
 
 
@@ -48,7 +47,7 @@ socket.on("data", function(data) {
 		var row=table.insertRow(table.rows.length);
 		var cell=row.insertCell(0);
 		cell.id = data.topic;
-		var cell=row.insertCell(0);
+		cell=row.insertCell(0);
 		cell.id = data.topic + "name";
 
 		document.getElementById(data.topic).style.textAlign="right";
diff --git a/homemon-server/public/javascripts/sensors2.js b/homemon-server/public/javascripts/sensors2.js
@@ -30,22 +30,22 @@ socket.on("data", function(data) {
 		var cell=row.insertCell(0);
 		cell.id = "sensors/co2/" + device;
 
-		var cell=row.insertCell(0);
+		cell=row.insertCell(0);
 		cell.id = "sensors/co/" + device;
 
-		var cell=row.insertCell(0);
+		cell=row.insertCell(0);
 		cell.id = "sensors/no2/" + device;
 
-		var cell=row.insertCell(0);
+		cell=row.insertCell(0);
 		cell.id = "sensors/humidity/" + device;
 
-		var cell=row.insertCell(0);
+		cell=row.insertCell(0);
 		cell.id = "sensors/pressure/" + device;
 
-		var cell=row.insertCell(0);
+		cell=row.insertCell(0);
 		cell.id = "sensors/temperature/" + device;
 
-		var cell=row.insertCell(0);
+		cell=row.insertCell(0);
 		cell.id = device + "name";
 
 
diff --git a/homemon-stats/homemon-stats.js b/homemon-stats/homemon-stats.js
@@ -78,7 +78,7 @@ mqttclient.on("connect", function() {
 		if(recordsDaily[topic] == undefined) {
 			recordsDaily[topic] = 0;
 		}
-		if(recordsLastValue[topic] == undefined) {
+		if(recordsLastValue[topic] === undefined) {
 			recordsLastValue[topic] = 0;
 		}
 
@@ -166,11 +166,11 @@ mqttclient.on("connect", function() {
 		}
 
 		// each time we get power/0 caculate then publish the "unknown power draw" and publish to power/U
-		if(topic == "sensors/power/0") {
+		if(topic === "sensors/power/0") {
 			var known = 0;
 			for (var key in recordsLastValue) {
 				// only it it matches sensors/power/[0-9]
-				if (key.length == 15 && key != "sensors/power/0" && key != "sensors/power/U") {
+				if (key.length === 15 && key != "sensors/power/0" && key != "sensors/power/U") {
 					// console.log(key, known, recordsLastValue[key]);
 					known += recordsLastValue[key]; 
 				}

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ BeginsWith = function(needle, haystack) {`
`5`	`5`	`return (haystack.substr(0, needle.length) == needle);`
`6`	`6`	`}`
`7`	`7`
`8`		`-var myvalues = [];`
`9`	`8`	`var updates = 0;`
`10`	`9`
`11`	`10`	`var socket = io.connect("http://homemon.trease.eu:8500/");`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ ElementExists = function(id) {`
`2`	`2`	`return !!document.getElementById(id);`
`3`	`3`	`};`
`4`	`4`	`BeginsWith = function(needle, haystack) {`
`5`		`- return (haystack.substr(0, needle.length) == needle);`
	`5`	`+ return (haystack.substr(0, needle.length) === needle);`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`// Load the Visualization API and the piechart package.`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ mqttclient.on("connect", function() {`
`78`	`78`	`if(recordsDaily[topic] == undefined) {`
`79`	`79`	`recordsDaily[topic] = 0;`
`80`	`80`	`}`
`81`		`- if(recordsLastValue[topic] == undefined) {`
	`81`	`+ if(recordsLastValue[topic] === undefined) {`
`82`	`82`	`recordsLastValue[topic] = 0;`
`83`	`83`	`}`
`84`	`84`
`@@ -166,11 +166,11 @@ mqttclient.on("connect", function() {`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`// each time we get power/0 caculate then publish the "unknown power draw" and publish to power/U`
`169`		`- if(topic == "sensors/power/0") {`
	`169`	`+ if(topic === "sensors/power/0") {`
`170`	`170`	`var known = 0;`
`171`	`171`	`for (var key in recordsLastValue) {`
`172`	`172`	`// only it it matches sensors/power/[0-9]`
`173`		`- if (key.length == 15 && key != "sensors/power/0" && key != "sensors/power/U") {`
	`173`	`+ if (key.length === 15 && key != "sensors/power/0" && key != "sensors/power/U") {`
`174`	`174`	`// console.log(key, known, recordsLastValue[key]);`
`175`	`175`	`known += recordsLastValue[key];`
`176`	`176`	`}`