FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-16 10:46:03 +00:00
Code Issues Releases Wiki Activity

FHEMWEB: fixing the longpollSVG inform bug.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4498 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2013-12-29 09:58:38 +00:00
parent 9442052080
commit 1b373cefe0
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/FHEM/01_FHEMWEB.pm
View File

@ -1960,6 +1960,7 @@ FW_roomStatesForInform($)
my ($room) = @_;
return "" if(!$room);
$room = ".*" if($room eq "all");
my @rl = devspec2array("room=$room");
my %extPage = ();
my @data;

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

@ -83,15 +83,21 @@ FW_longpoll()
FW_curLine = 0;
FW_pollConn = new XMLHttpRequest();
var room="room=all";
var embArr = document.getElementsByTagName("embed");
if(embArr.length == 0) { // SVG image content is not room dependent
var room="", embArr = document.getElementsByTagName("embed");
for(var i = 0; i < embArr.length; i++) {
var svg = embArr[i].getSVGDocument();
if(svg != null && svg.firstChild.nextSibling.getAttribute("flog"))
room="room=all";
}
if(room == "") {
var sa = document.location.search.substring(1).split("&");
for(var i = 0; i < sa.length; i++) {
if(sa[i].substring(0,5) == "room=")
room=sa[i];
}
}
// Needed when using multiple FF windows
var timestamp = "&timestamp="+new Date().getTime();
var query = document.location.pathname+"?"+room+"&XHR=1&inform=1"+timestamp;