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

Use unique names for nested callbacks (#397)

Browse source
This commit is contained in:
SCG82 2021-02-09 05:00:51 -08:00 committed by GitHub
parent 011f8843fc
commit 53fb62e096
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
speedtest.js
View file

@ -191,9 +191,9 @@ Speedtest.prototype = {
throw "You can't select a server while the test is running";
}
if (this._selectServerCalled) throw "selectServer already called"; else this._selectServerCalled=true;
/*this function goes through a list of servers. For each server, the ping is measured, then the server with the function result is called with the best server, or null if all the servers were down.
/*this function goes through a list of servers. For each server, the ping is measured, then the server with the function selected is called with the best server, or null if all the servers were down.
*/
var select = function(serverList, result) {
var select = function(serverList, selected) {
//pings the specified URL, then calls the function result. Result will receive a parameter which is either the time it took to ping the URL, or -1 if something went wrong.
var PING_TIMEOUT = 2000;
var USE_PING_TIMEOUT = true; //will be disabled on unsupported browsers
@ -201,7 +201,7 @@ Speedtest.prototype = {
//IE11 doesn't support XHR timeout
USE_PING_TIMEOUT = false;
}
var ping = function(url, result) {
var ping = function(url, rtt) {
url += (url.match(/\?/) ? "&" : "?") + "cors=true";
var xhr = new XMLHttpRequest();
var t = new Date().getTime();
@ -217,11 +217,11 @@ Speedtest.prototype = {
if (d <= 0) d = p.duration;
if (d > 0 && d < instspd) instspd = d;
} catch (e) {}
result(instspd);
} else result(-1);
rtt(instspd);
} else rtt(-1);
}.bind(this);
xhr.onerror = function() {
result(-1);
rtt(-1);
}.bind(this);
xhr.open("GET", url);
if (USE_PING_TIMEOUT) {
@ -271,7 +271,7 @@ Speedtest.prototype = {
)
bestServer = serverList[i];
}
result(bestServer);
selected(bestServer);
}.bind(this);
var nextServer = function() {
if (i == serverList.length) {