Merge branch 'master' into docker
This commit is contained in:
commit
9816f1b65d
|
@ -201,7 +201,7 @@
|
||||||
var interval = setInterval(function () { w.postMessage('status') }, 100)
|
var interval = setInterval(function () { w.postMessage('status') }, 100)
|
||||||
w.onmessage = function (event) {
|
w.onmessage = function (event) {
|
||||||
var data = JSON.parse(event.data)
|
var data = JSON.parse(event.data)
|
||||||
var status = data.testStatus
|
var status = data.testState
|
||||||
if (status >= 4) {
|
if (status >= 4) {
|
||||||
clearInterval(interval)
|
clearInterval(interval)
|
||||||
document.getElementById('abortBtn').style.display = 'none'
|
document.getElementById('abortBtn').style.display = 'none'
|
||||||
|
|
|
@ -132,7 +132,7 @@ function startStop(){
|
||||||
I("startStopBtn").className="running";
|
I("startStopBtn").className="running";
|
||||||
w.onmessage=function(e){
|
w.onmessage=function(e){
|
||||||
var data=JSON.parse(e.data);
|
var data=JSON.parse(e.data);
|
||||||
var status=data.testStatus;
|
var status=data.testState;
|
||||||
if(status>=4){
|
if(status>=4){
|
||||||
//test completed
|
//test completed
|
||||||
I("startStopBtn").className="";
|
I("startStopBtn").className="";
|
||||||
|
|
|
@ -126,7 +126,7 @@ function startStop(){
|
||||||
I("startStopBtn").className="running";
|
I("startStopBtn").className="running";
|
||||||
w.onmessage=function(e){
|
w.onmessage=function(e){
|
||||||
var data=JSON.parse(e.data);
|
var data=JSON.parse(e.data);
|
||||||
var status=data.testStatus;
|
var status=data.testState;
|
||||||
if(status>=4){
|
if(status>=4){
|
||||||
//test completed
|
//test completed
|
||||||
I("startStopBtn").className="";
|
I("startStopBtn").className="";
|
||||||
|
|
|
@ -164,7 +164,7 @@ function startStop(){
|
||||||
I("startStopBtn").className="running";
|
I("startStopBtn").className="running";
|
||||||
w.onmessage=function(e){
|
w.onmessage=function(e){
|
||||||
data=JSON.parse(e.data);
|
data=JSON.parse(e.data);
|
||||||
var status=data.testStatus;
|
var status=data.testState;
|
||||||
if(status>=4){
|
if(status>=4){
|
||||||
//test completed
|
//test completed
|
||||||
I("startStopBtn").className="";
|
I("startStopBtn").className="";
|
||||||
|
@ -177,7 +177,7 @@ function startStop(){
|
||||||
//this function reads the data sent back by the worker and updates the UI
|
//this function reads the data sent back by the worker and updates the UI
|
||||||
function updateUI(forced){
|
function updateUI(forced){
|
||||||
if(!forced&&(!data||!w)) return;
|
if(!forced&&(!data||!w)) return;
|
||||||
var status=data.testStatus;
|
var status=data.testState;
|
||||||
I("ip").textContent=data.clientIp;
|
I("ip").textContent=data.clientIp;
|
||||||
I("dlText").textContent=(status==1&&data.dlStatus==0)?"...":data.dlStatus;
|
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);
|
drawMeter(I("dlMeter"),mbpsToAmount(Number(data.dlStatus*(status==1?oscillate():1))),meterBk,dlColor,Number(data.dlProgress),progColor);
|
||||||
|
|
|
@ -126,7 +126,7 @@ function startStop(){
|
||||||
I("startStopBtn").className="running";
|
I("startStopBtn").className="running";
|
||||||
w.onmessage=function(e){
|
w.onmessage=function(e){
|
||||||
var data=JSON.parse(e.data);
|
var data=JSON.parse(e.data);
|
||||||
var status=data.testStatus;
|
var status=data.testState;
|
||||||
if(status>=4){
|
if(status>=4){
|
||||||
//test completed
|
//test completed
|
||||||
I("startStopBtn").className="";
|
I("startStopBtn").className="";
|
||||||
|
|
|
@ -144,7 +144,7 @@ function startStop(){
|
||||||
I("startStopBtn").className="running";
|
I("startStopBtn").className="running";
|
||||||
w.onmessage=function(e){
|
w.onmessage=function(e){
|
||||||
var data=JSON.parse(e.data);
|
var data=JSON.parse(e.data);
|
||||||
var status=data.testStatus;
|
var status=data.testState;
|
||||||
if(status>=4){
|
if(status>=4){
|
||||||
//test completed
|
//test completed
|
||||||
I("startStopBtn").className="";
|
I("startStopBtn").className="";
|
||||||
|
|
|
@ -181,7 +181,7 @@ function startStop(){
|
||||||
I("shareArea").style.display="none";
|
I("shareArea").style.display="none";
|
||||||
w.onmessage=function(e){
|
w.onmessage=function(e){
|
||||||
data=JSON.parse(e.data);
|
data=JSON.parse(e.data);
|
||||||
var status=data.testStatus;
|
var status=data.testState;
|
||||||
if(status>=4){
|
if(status>=4){
|
||||||
//test completed
|
//test completed
|
||||||
I("startStopBtn").className="";
|
I("startStopBtn").className="";
|
||||||
|
@ -207,7 +207,7 @@ function startStop(){
|
||||||
//this function reads the data sent back by the worker and updates the UI
|
//this function reads the data sent back by the worker and updates the UI
|
||||||
function updateUI(forced){
|
function updateUI(forced){
|
||||||
if(!forced&&(!data||!w)) return;
|
if(!forced&&(!data||!w)) return;
|
||||||
var status=data.testStatus;
|
var status=data.testState;
|
||||||
I("ip").textContent=data.clientIp;
|
I("ip").textContent=data.clientIp;
|
||||||
I("dlText").textContent=(status==1&&data.dlStatus==0)?"...":data.dlStatus;
|
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);
|
drawMeter(I("dlMeter"),mbpsToAmount(Number(data.dlStatus*(status==1?oscillate():1))),meterBk,dlColor,Number(data.dlProgress),progColor);
|
||||||
|
|
|
@ -126,7 +126,7 @@ function startStop(){
|
||||||
I("startStopBtn").className="running";
|
I("startStopBtn").className="running";
|
||||||
w.onmessage=function(e){
|
w.onmessage=function(e){
|
||||||
var data=JSON.parse(e.data);
|
var data=JSON.parse(e.data);
|
||||||
var status=data.testStatus
|
var status=data.testState
|
||||||
if(status>=4){
|
if(status>=4){
|
||||||
//test completed
|
//test completed
|
||||||
I("startStopBtn").className="";
|
I("startStopBtn").className="";
|
||||||
|
|
|
@ -72,7 +72,7 @@ this.addEventListener('message', function (e) {
|
||||||
var params = e.data.split(' ')
|
var params = e.data.split(' ')
|
||||||
if (params[0] === 'status') { // return status
|
if (params[0] === 'status') { // return status
|
||||||
postMessage(JSON.stringify({
|
postMessage(JSON.stringify({
|
||||||
testStatus:testStatus,
|
testState:testStatus,
|
||||||
dlStatus:dlStatus,
|
dlStatus:dlStatus,
|
||||||
ulStatus:ulStatus,
|
ulStatus:ulStatus,
|
||||||
pingStatus:pingStatus,
|
pingStatus:pingStatus,
|
||||||
|
|
2
speedtest_worker.min.js
vendored
2
speedtest_worker.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue