diff --git a/FHEM/95_FLOORPLAN.pm b/FHEM/95_FLOORPLAN.pm index 89246ea54..5fdde7711 100644 --- a/FHEM/95_FLOORPLAN.pm +++ b/FHEM/95_FLOORPLAN.pm @@ -36,6 +36,7 @@ # 0025: Added fp_viewport-attribute from Jens (March 03, 2013) # 0026: Adapted to FHEMWEB-changes re webCmdFn - fp_setbutton not functional (May 23, 2013) # 0027: Added FP_detailFn(), added delete-button in arrange-menu, fixed link for pdf-docu, minor code cleanup, added get config (July 08, 2013) +# 0028: Implemented informid for longpoll, usage of @FW_fhemwebjs (July 19, 2013) # ################################################################ # @@ -92,6 +93,7 @@ use strict; use warnings; use vars qw(%data); use vars qw($FW_longpoll); +use vars qw(@FW_fhemwebjs); # List of fhemweb*js scripts to load - from FHEMWEB ######################### # Forward declaration @@ -357,9 +359,14 @@ FP_htmlHeader($) { my $css= AttrVal($FP_name, "stylesheet", $defaultcss); FW_pO ""; #set sripts - FW_pO "" - if($FW_plotmode eq "SVG"); - FW_pO ""; +# FW_pO "" +# if($FW_plotmode eq "SVG"); +# FW_pO ""; + my $jsTemplate = ''; + FW_pO sprintf($jsTemplate, "$FW_ME/pgm2/svg.js") if($FW_plotmode eq "SVG"); + foreach my $js (@FW_fhemwebjs) { + FW_pO sprintf($jsTemplate, "$FW_ME/pgm2/$js"); + } # FW Extensions if(defined($data{FWEXT})) { foreach my $k (sort keys %{$data{FWEXT}}) { @@ -495,14 +502,14 @@ FP_show(){ $fp_fpimage =~ s/\{state\}/$state/; # replace {state} by actual device-status $txt =~ s/\$txt"; + FW_pO "$txt"; FW_pO ""; if ($style == 6) { # add ReadingsTimeStamp for style 6 $txt=""; FW_pO ""; # For css: class=devicetimestamp, id=-devicetimestamp $txt = ReadingsTimestamp($d, $text, "Undefined Reading $d-$text") if ($style == 3 || $style == 6); # Style3+6 = DeviceReading given in $text - FW_pO "$txt"; + FW_pO "$txt"; FW_pO ""; }