From eb0ece628611bb397e39a2d384fd16ec212be0a6 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Tue, 28 Jan 2014 09:06:08 +0000 Subject: [PATCH] fhemweb.js: check body longpollfilter attribute (for Dashboard) console.log("F1:"+filter); git-svn-id: https://svn.fhem.de/fhem/trunk@4760 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/www/pgm2/fhemweb.js | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/fhem/www/pgm2/fhemweb.js b/fhem/www/pgm2/fhemweb.js index 36a2b3829..72006c1a4 100644 --- a/fhem/www/pgm2/fhemweb.js +++ b/fhem/www/pgm2/fhemweb.js @@ -84,14 +84,19 @@ FW_longpoll() FW_pollConn = new XMLHttpRequest(); - var filter="", embArr = document.getElementsByTagName("embed"); - for(var i = 0; i < embArr.length; i++) { - var svg = embArr[i].getSVGDocument(); - if(svg && - svg.firstChild && - svg.firstChild.nextSibling && - svg.firstChild.nextSibling.getAttribute("flog")) - filter=".*"; + var filter = document.body.getAttribute("longpollfilter"); + if(filter == null) + filter = ""; + if(filter == "") { + var embArr = document.getElementsByTagName("embed"); + for(var i = 0; i < embArr.length; i++) { + var svg = embArr[i].getSVGDocument(); + if(svg && + svg.firstChild && + svg.firstChild.nextSibling && + svg.firstChild.nextSibling.getAttribute("flog")) + filter=".*"; + } } if(filter == "") { var sa = document.location.search.substring(1).split("&"); @@ -107,6 +112,9 @@ FW_longpoll() name = name.substring(0,name.length-5); filter=".*;iconPath="+name; } + var iP = document.body.getAttribute("iconPath"); + if(iP != null) + filter = filter +";iconPath="+iP; var query = document.location.pathname+"?XHR=1"+ "&inform=type=status;filter="+filter+