From 6c8440f93a7c4325cc9d85957c52b587dbb2483d Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sun, 2 Sep 2018 14:45:43 +0000 Subject: [PATCH] 98_SVG.pm: remove multiple zoom buttons for plotEmbed=0/plotFork=1 git-svn-id: https://svn.fhem.de/fhem/trunk@17255 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/01_FHEMWEB.pm | 3 ++- fhem/FHEM/98_SVG.pm | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index 2f38d03d6..559ac3ab9 100644 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -1908,7 +1908,7 @@ FW_showRoom() my $doBC = (AttrVal($FW_wname, "plotfork", 0) && AttrVal($FW_wname, "plotEmbed", 0) == 0); my %res; - my $idx = 1; + my ($idx,$svgIdx) = (1,1); @atEnds = sort { $sortIndex{$a} cmp $sortIndex{$b} } @atEnds; foreach my $d (@atEnds) { no strict "refs"; @@ -1916,6 +1916,7 @@ FW_showRoom() $extPage{group} = "atEnd"; $extPage{index} = $idx++; if($doBC && $defs{$d}{TYPE} eq "SVG" && $FW_use{base64}) { + $extPage{svgIdx} = $svgIdx++; BlockingCall(sub { return "$FW_cname,$d,". encode_base64(&{$fn}($FW_wname,$d,$FW_room,\%extPage),''); diff --git a/fhem/FHEM/98_SVG.pm b/fhem/FHEM/98_SVG.pm index 28aa49bc4..93f1c84a9 100644 --- a/fhem/FHEM/98_SVG.pm +++ b/fhem/FHEM/98_SVG.pm @@ -222,6 +222,7 @@ SVG_FwFn($$$$) my $ret = ""; my $isFirst = (!$pageHash || !$pageHash->{svgLoaded}); + $isFirst = 0 if($pageHash && $pageHash->{svgIdx} && $pageHash->{svgIdx} != 1); $pageHash->{svgLoaded} = 1 if($pageHash); $ret .= "" if($isFirst);