Merged with master
This commit is contained in:
commit
19148b3225
5
.gitignore
vendored
5
.gitignore
vendored
|
@ -1,2 +1,7 @@
|
|||
<<<<<<< HEAD
|
||||
node_modules
|
||||
.idea
|
||||
=======
|
||||
results/idObfuscation_salt.php
|
||||
backend/getIP_serverLocation.php
|
||||
>>>>>>> master
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
<head>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, user-scalable=no" />
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="shortcut icon" href="favicon.ico">
|
||||
<script type="text/javascript" src="speedtest.js"></script>
|
||||
<script type="text/javascript">
|
||||
function I(i){return document.getElementById(i);}
|
||||
|
|
|
@ -72,6 +72,9 @@ Speedtest.prototype = {
|
|||
if (this._state != 0)
|
||||
throw "You cannot change the test settings after adding server or starting the test";
|
||||
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.
|
||||
|
@ -319,10 +322,10 @@ Speedtest.prototype = {
|
|||
this._selectedServer.server + this._selectedServer.pingURL;
|
||||
this._settings.url_getIp =
|
||||
this._selectedServer.server + this._selectedServer.getIpURL;
|
||||
if (typeof this._settings.telemetry_extra !== "undefined") {
|
||||
if (typeof this._originalExtra !== "undefined") {
|
||||
this._settings.telemetry_extra = JSON.stringify({
|
||||
server: this._selectedServer.name,
|
||||
extra: this._settings.telemetry_extra
|
||||
extra: this._originalExtra
|
||||
});
|
||||
} else
|
||||
this._settings.telemetry_extra = JSON.stringify({
|
||||
|
|
|
@ -249,6 +249,7 @@ this.addEventListener("message", function(e) {
|
|||
}
|
||||
if (params[0] === "abort") {
|
||||
// abort command
|
||||
if (testState >= 4) return;
|
||||
tlog("manually aborted");
|
||||
clearRequests(); // stop all xhr activity
|
||||
runNextTest = null;
|
||||
|
|
Loading…
Reference in a new issue