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

themes/base: several IE related fixes in XHR class

Browse source
This commit is contained in:
Jo-Philipp Wich 2010-11-18 07:21:14 +00:00
parent dfc723af3e
commit f3218c456a
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
themes/base/htdocs/luci-static/resources/xhr.js
View file

@ -56,17 +56,17 @@ XHR = function()
xhr.onreadystatechange = function() xhr.onreadystatechange = function()
{ {
var json = null;
if( xhr.getResponseHeader("Content-Type") == "application/json" ) {
try {
json = eval('(' + xhr.responseText + ')');
}
catch(e) {
json = null;
}
}
if( xhr.readyState == 4 ) { if( xhr.readyState == 4 ) {
var json = null;
if( xhr.getResponseHeader("Content-Type") == "application/json" ) {
try {
json = eval('(' + xhr.responseText + ')');
}
catch(e) {
json = null;
}
}
callback( xhr, json ); callback( xhr, json );
} }
} }
@ -144,6 +144,9 @@ XHR = function()
this._encode = function(obj) this._encode = function(obj)
{ {
obj = obj ? obj : { };
obj['_'] = Math.random();
if( typeof obj == 'object' ) if( typeof obj == 'object' )
{ {
var code = ''; var code = '';
@ -152,6 +155,7 @@ XHR = function()
for( var k in obj ) for( var k in obj )
code += ( code ? '&' : '' ) + code += ( code ? '&' : '' ) +
k + '=' + encodeURIComponent( obj[k] ); k + '=' + encodeURIComponent( obj[k] );
return code; return code;
} }