beenull/speedtest
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merged with master

Browse source
This commit is contained in:
dosse91 2019-08-31 19:25:15 +02:00
parent 4715d9d6c7 93a4410efa
commit 19148b3225
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -1,2 +1,7 @@
<<<<<<< HEAD
node_modules node_modules
.idea .idea
=======
results/idObfuscation_salt.php
backend/getIP_serverLocation.php
>>>>>>> master

1
src/public/index.html
View file

@ -3,6 +3,7 @@
<head> <head>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, user-scalable=no" /> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, user-scalable=no" />
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="shortcut icon" href="favicon.ico">
<script type="text/javascript" src="speedtest.js"></script> <script type="text/javascript" src="speedtest.js"></script>
<script type="text/javascript"> <script type="text/javascript">
function I(i){return document.getElementById(i);} function I(i){return document.getElementById(i);}

7
src/public/speedtest.js
View file

@ -72,6 +72,9 @@ Speedtest.prototype = {
if (this._state != 0) if (this._state != 0)
throw "You cannot change the test settings after adding server or starting the test"; throw "You cannot change the test settings after adding server or starting the test";
this._settings[parameter] = value; this._settings[parameter] = value;
if(parameter === "temeletry_extra"){
this._originalExtra=this._settings.telemetry_extra;
}
}, },
/** /**
* Used internally to check if a server object contains all the required elements. * Used internally to check if a server object contains all the required elements.
@ -319,10 +322,10 @@ Speedtest.prototype = {
this._selectedServer.server + this._selectedServer.pingURL; this._selectedServer.server + this._selectedServer.pingURL;
this._settings.url_getIp = this._settings.url_getIp =
this._selectedServer.server + this._selectedServer.getIpURL; this._selectedServer.server + this._selectedServer.getIpURL;
if (typeof this._settings.telemetry_extra !== "undefined") { if (typeof this._originalExtra !== "undefined") {
this._settings.telemetry_extra = JSON.stringify({ this._settings.telemetry_extra = JSON.stringify({
server: this._selectedServer.name, server: this._selectedServer.name,
extra: this._settings.telemetry_extra extra: this._originalExtra
}); });
} else } else
this._settings.telemetry_extra = JSON.stringify({ this._settings.telemetry_extra = JSON.stringify({

1
src/public/speedtest_worker.js
View file

@ -249,6 +249,7 @@ this.addEventListener("message", function(e) {
} }
if (params[0] === "abort") { if (params[0] === "abort") {
// abort command // abort command
if (testState >= 4) return;
tlog("manually aborted"); tlog("manually aborted");
clearRequests(); // stop all xhr activity clearRequests(); // stop all xhr activity
runNextTest = null; runNextTest = null;