From 58c5d618ae1848ef97e0a04c5f35319e1f73436e Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Fri, 4 Nov 2016 20:37:18 +0000 Subject: [PATCH] fhemweb.js: wait for SVG loading to check for longpollSVG (Forum #60053) git-svn-id: https://svn.fhem.de/fhem/trunk@12505 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/www/pgm2/fhemweb.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/fhem/www/pgm2/fhemweb.js b/fhem/www/pgm2/fhemweb.js index 844d0fb26..63e46c238 100644 --- a/fhem/www/pgm2/fhemweb.js +++ b/fhem/www/pgm2/fhemweb.js @@ -8,6 +8,7 @@ var FW_isiOS = navigator.userAgent.match(/(iPad|iPhone|iPod)/); var FW_scripts = {}, FW_links = {}; var FW_docReady = false; var FW_root = "/fhem"; // root +var embedLoadRetry = 100; // createFn returns an HTML Element, which may contain // - setValueFn, which is called when data via longpoll arrives @@ -627,7 +628,6 @@ FW_rawDef() { if(++i1 >= arr.length) { return FW_okDialog("Executed everything, no errors found."); - return; } str += arr[i1]; if(arr[i1].charAt(arr[i1].length-1) === "\\") { @@ -755,11 +755,20 @@ FW_longpoll() var filter = $("body").attr("longpollfilter"); if(filter == null) filter = ""; + var retry; if(filter == "") { $("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")) filter=".*"; }); + if(retry) + return; } if(filter == "") {