FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-13 23:36:37 +00:00
Code Issues Releases Wiki Activity

fhemweb.js: wait for SVG loading to check for longpollSVG (Forum #60053)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12505 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-11-04 20:37:18 +00:00
parent 86d32b2075
commit 58c5d618ae
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/www/pgm2/fhemweb.js
View File

@ -8,6 +8,7 @@ var FW_isiOS = navigator.userAgent.match(/(iPad|iPhone|iPod)/);
var FW_scripts = {}, FW_links = {}; var FW_scripts = {}, FW_links = {};
var FW_docReady = false; var FW_docReady = false;
var FW_root = "/fhem"; // root var FW_root = "/fhem"; // root
var embedLoadRetry = 100;
// createFn returns an HTML Element, which may contain // createFn returns an HTML Element, which may contain
// - setValueFn, which is called when data via longpoll arrives // - setValueFn, which is called when data via longpoll arrives
@ -627,7 +628,6 @@ FW_rawDef()
{ {
if(++i1 >= arr.length) { if(++i1 >= arr.length) {
return FW_okDialog("Executed everything, no errors found."); return FW_okDialog("Executed everything, no errors found.");
return;
} }
str += arr[i1]; str += arr[i1];
if(arr[i1].charAt(arr[i1].length-1) === "\\") { if(arr[i1].charAt(arr[i1].length-1) === "\\") {
@ -755,11 +755,20 @@ FW_longpoll()
var filter = $("body").attr("longpollfilter"); var filter = $("body").attr("longpollfilter");
if(filter == null) if(filter == null)
filter = ""; filter = "";
var retry;
if(filter == "") { if(filter == "") {
$("embed").each(function() { $("embed").each(function() {
if($(this.getSVGDocument()).length == 0 && !retry &&
filter != ".*" && --embedLoadRetry > 0) {
retry = 1;
setTimeout(FW_longpoll, 100);
return;
}
if($(this.getSVGDocument()).find("svg[flog]").attr("flog")) if($(this.getSVGDocument()).find("svg[flog]").attr("flog"))
filter=".*"; filter=".*";
}); });
if(retry)
return;
} }
if(filter == "") { if(filter == "") {