Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

www/pgm2/fhemweb.js: remove <pre> Formatting for <html> data

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@18903 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2019-03-14 18:29:39 +00:00
parent 9e32b2b046
commit 3b3fac3ac3
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
www/pgm2/fhemweb.js
View File

@ -160,8 +160,14 @@ FW_jqueryReadyFn()
"="+encodeURIComponent($(this).val());
});
FW_cmd(FW_root+"?"+cmd+"&XHR=1&addLinks=1", function(data) {
if(!data.match(/^[\r\n]*$/)) // ignore empty answers
FW_okDialog('<pre>'+data+'</pre>', el);
if(!data.match(/^[\r\n]*$/)) {// ignore empty answers
var ma = /^<html>([\s\S]*)<\/html>/.exec(data);
if(ma) {
FW_okDialog(ma[1], el);
} else {
FW_okDialog('<pre>'+data+'</pre>', el);
}
}
});
});
@ -1005,7 +1011,7 @@ FW_doUpdate(evt)
if(d[2].match(/\n/) && !d[2].match(/<.*>/)) // format multiline
d[2] = '<html><pre>'+d[2]+'</pre></html>';
var ma = /^<html>([\s\S]*)<\/html>$/.exec(d[2]);
var ma = /^<html>([\s\S]*)<\/html>/.exec(d[2]);
if(!d[0].match("-")) // not a reading
$(this).html(d[2]);
else if(ma)