Merge branch 'master' into docker

example-chart.html

@@ -201,7 +201,7 @@
             var interval = setInterval(function () { w.postMessage('status') }, 100)
             w.onmessage = function (event) {
                 var data = JSON.parse(event.data)
-                var status = data.testStatus
+                var status = data.testState
                 if (status >= 4) {
                     clearInterval(interval)
                     document.getElementById('abortBtn').style.display = 'none'

example-customSettings.html

@@ -132,7 +132,7 @@ function startStop(){
 		I("startStopBtn").className="running";
 		w.onmessage=function(e){
 			var data=JSON.parse(e.data);
-			var status=data.testStatus;
+			var status=data.testState;
 			if(status>=4){
 				//test completed
 				I("startStopBtn").className="";

example-customSettings2.html

@@ -126,7 +126,7 @@ function startStop(){
 		I("startStopBtn").className="running";
 		w.onmessage=function(e){
 			var data=JSON.parse(e.data);
-			var status=data.testStatus;
+			var status=data.testState;
 			if(status>=4){
 				//test completed
 				I("startStopBtn").className="";

example-gauges.html

@@ -164,7 +164,7 @@ function startStop(){
 		I("startStopBtn").className="running";
 		w.onmessage=function(e){
 			data=JSON.parse(e.data);
-			var status=data.testStatus;
+			var status=data.testState;
 			if(status>=4){
 				//test completed
 				I("startStopBtn").className="";
@@ -177,7 +177,7 @@ function startStop(){
 //this function reads the data sent back by the worker and updates the UI
 function updateUI(forced){
 	if(!forced&&(!data||!w)) return;
-	var status=data.testStatus;
+	var status=data.testState;
 	I("ip").textContent=data.clientIp;
 	I("dlText").textContent=(status==1&&data.dlStatus==0)?"...":data.dlStatus;
 	drawMeter(I("dlMeter"),mbpsToAmount(Number(data.dlStatus*(status==1?oscillate():1))),meterBk,dlColor,Number(data.dlProgress),progColor);

example-pretty.html

@@ -126,7 +126,7 @@ function startStop(){
 		I("startStopBtn").className="running";
 		w.onmessage=function(e){
 			var data=JSON.parse(e.data);
-			var status=data.testStatus;
+			var status=data.testState;
 			if(status>=4){
 				//test completed
 				I("startStopBtn").className="";

example-progressBar.html

@@ -144,7 +144,7 @@ function startStop(){
 		I("startStopBtn").className="running";
 		w.onmessage=function(e){
 			var data=JSON.parse(e.data);
-			var status=data.testStatus;
+			var status=data.testState;
 			if(status>=4){
 				//test completed
 				I("startStopBtn").className="";

example-telemetry-resultSharing.html

@@ -181,7 +181,7 @@ function startStop(){
 		I("shareArea").style.display="none";
 		w.onmessage=function(e){
 			data=JSON.parse(e.data);
-			var status=data.testStatus;
+			var status=data.testState;
 			if(status>=4){
 				//test completed
 				I("startStopBtn").className="";
@@ -207,7 +207,7 @@ function startStop(){
 //this function reads the data sent back by the worker and updates the UI
 function updateUI(forced){
 	if(!forced&&(!data||!w)) return;
-	var status=data.testStatus;
+	var status=data.testState;
 	I("ip").textContent=data.clientIp;
 	I("dlText").textContent=(status==1&&data.dlStatus==0)?"...":data.dlStatus;
 	drawMeter(I("dlMeter"),mbpsToAmount(Number(data.dlStatus*(status==1?oscillate():1))),meterBk,dlColor,Number(data.dlProgress),progColor);

example-telemetryEnabled.html

@@ -126,7 +126,7 @@ function startStop(){
 		I("startStopBtn").className="running";
 		w.onmessage=function(e){
 			var data=JSON.parse(e.data);
-			var status=data.testStatus
+			var status=data.testState
 			if(status>=4){
 				//test completed
 				I("startStopBtn").className="";

speedtest_worker.js

@@ -72,7 +72,7 @@ this.addEventListener('message', function (e) {
   var params = e.data.split(' ')
   if (params[0] === 'status') { // return status
     postMessage(JSON.stringify({
-		testStatus:testStatus,
+		testState:testStatus,
 		dlStatus:dlStatus,
 		ulStatus:ulStatus,
 		pingStatus:pingStatus,