mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-05-04 22:19:38 +00:00
fhemweb.js: fix loadScript for iOS. fhemweb_multiple: IE8 fix.
git-svn-id: https://svn.fhem.de/fhem/trunk@5850 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
43ccee130a
commit
cd186e8ffd
@ -3,6 +3,9 @@ var FW_pollConn;
|
||||
var FW_curLine; // Number of the next line in FW_pollConn.responseText to parse
|
||||
var FW_widgets = new Object(); // to be filled by fhemweb_*.js
|
||||
var FW_leaving;
|
||||
var isIE = (navigator.appVersion.indexOf("MSIE") > 0);
|
||||
var isiOS = navigator.userAgent.match(/(iPad|iPhone|iPod)/);
|
||||
|
||||
|
||||
function
|
||||
log(txt)
|
||||
@ -310,15 +313,28 @@ loadScript(sname, callback)
|
||||
script.src = sname;
|
||||
script.async = script.defer = false;
|
||||
script.type = "text/javascript";
|
||||
script.onload = callback;
|
||||
|
||||
|
||||
log("Loading "+sname);
|
||||
script.onreadystatechange = function() {
|
||||
if(script.readyState == 'loaded' || script.readyState == 'complete') {
|
||||
script.onreadystatechange = null;
|
||||
if(isIE) {
|
||||
script.onreadystatechange = function() {
|
||||
if(script.readyState == 'loaded' || script.readyState == 'complete') {
|
||||
script.onreadystatechange = null;
|
||||
if(callback)
|
||||
callback();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if(isiOS)
|
||||
FW_pollConn.abort();
|
||||
script.onload = function(){
|
||||
if(callback)
|
||||
callback();
|
||||
if(isiOS)
|
||||
FW_longpoll();
|
||||
}
|
||||
}
|
||||
|
||||
h.appendChild(script);
|
||||
}
|
||||
|
||||
|
@ -39,10 +39,13 @@ FW_multipleSelect(el)
|
||||
delete(selObj[v]);
|
||||
}
|
||||
|
||||
var selArr=[];
|
||||
for(var i1 in selObj)
|
||||
selArr.push(i1);
|
||||
$('body').append(
|
||||
'<div id="multidlg" style="display:none">'+
|
||||
'<table>'+table+'</table><input id="md_freeText" '+
|
||||
'value="'+Object.keys(selObj).join(',')+'"/>'+
|
||||
'value="'+selArr.join(',')+'"/>'+
|
||||
'</div>');
|
||||
|
||||
$('#multidlg').dialog(
|
||||
|
Loading…
x
Reference in New Issue
Block a user