Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-base: xhr.js: use JSON.parse() and pass request duration to callbacks

Browse source 
JSON.parse() is supported on all modern browsers and a far better
solution than the hakish and potentially dangerous eval().

Also calculate the duration of request and pass it as 3rd argument to the
callback function, this makes it easier to calculate request delays or
poll intervals in code using XHR.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2018-07-12 07:34:04 +02:00
parent 0d96655f8b
commit 674b090d34
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/luci-base/htdocs/luci-static/resources/xhr.js
View file

@ -43,6 +43,7 @@ XHR = function()
{
this.reinit();
var ts = Date.now();
var xhr = this._xmlHttp;
var code = this._encode(data);
@ -65,14 +66,14 @@ XHR = function()
var json = null;
if (xhr.getResponseHeader("Content-Type") == "application/json") {
try {
json = eval('(' + xhr.responseText + ')');
json = JSON.parse(xhr.responseText);
}
catch(e) {
json = null;
}
}
callback(xhr, json);
callback(xhr, json, Date.now() - ts);
}
}
@ -83,13 +84,14 @@ XHR = function()
{
this.reinit();
var ts = Date.now();
var xhr = this._xmlHttp;
var code = this._encode(data);
xhr.onreadystatechange = function()
{
if (xhr.readyState == 4)
callback(xhr);
callback(xhr, null, Date.now() - ts);
}
xhr.open('POST', url, true);