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

fhem/www/pgm2/fhemweb.js

@@ -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,8 +313,10 @@ loadScript(sname, callback)
   script.src = sname;
   script.async = script.defer = false;
   script.type = "text/javascript";
-  script.onload = callback;
+
+
   log("Loading "+sname);
+  if(isIE) {
     script.onreadystatechange = function() {
       if(script.readyState == 'loaded' || script.readyState == 'complete') {
         script.onreadystatechange = null;
@@ -319,6 +324,17 @@ loadScript(sname, callback)
           callback();
       }
     }
+  } else {
+    if(isiOS)
+      FW_pollConn.abort();
+    script.onload = function(){
+      if(callback)
+        callback();
+      if(isiOS)
+        FW_longpoll();
+    }
+  }
+  
   h.appendChild(script);
 }
 

fhem/www/pgm2/fhemweb_multiple.js

@@ -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(