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

98_SVG.pm: fix the "Show preprocessed input" for some cases (Forum #32028)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7545 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-01-13 14:10:05 +00:00
parent 1155c27b1f
commit 0027c459f1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/FHEM/01_FHEMWEB.pm
View File

@ -989,7 +989,6 @@ sub
FW_detailSelect($$$$) FW_detailSelect($$$$)
{ {
my ($d, $cmd, $list,$class) = @_; my ($d, $cmd, $list,$class) = @_;
Log 1, "$cmd $d $list";
return if(!$list || $FW_hiddenroom{input}); return if(!$list || $FW_hiddenroom{input});
my @al = sort map { s/:.*//;$_ } split(" ", $list); my @al = sort map { s/:.*//;$_ } split(" ", $list);
@ -1575,7 +1574,7 @@ FW_select($$$$$@)
{ {
my ($id, $name, $valueArray, $selected, $class, $jSelFn) = @_; my ($id, $name, $valueArray, $selected, $class, $jSelFn) = @_;
$jSelFn = ($jSelFn ? "onchange=\"$jSelFn\"" : ""); $jSelFn = ($jSelFn ? "onchange=\"$jSelFn\"" : "");
$id =~ s/\./_/g; # to avoid problems in JS DOM Search $id =~ s/\./_/g if($id); # to avoid problems in JS DOM Search
$id = ($id ? "id=\"$id\" informId=\"$id\"" : ""); $id = ($id ? "id=\"$id\" informId=\"$id\"" : "");
my $s = "<select $jSelFn $id name=\"$name\" class=\"$class\">"; my $s = "<select $jSelFn $id name=\"$name\" class=\"$class\">";
foreach my $v (@{$valueArray}) { foreach my $v (@{$valueArray}) {

2
fhem/FHEM/98_SVG.pm
View File

@ -530,7 +530,7 @@ SVG_showData()
return 1; return 1;
} }
SVG_calcOffsets($d, $wl); SVG_calcOffsets($d, $wl);
$FW_RET = SVG_getData($d, $SVG_devs{$d}{from}, $SVG_devs{$d}{to}, $srcDesc,1); $FW_RET = SVG_getData($wl,$SVG_devs{$d}{from}, $SVG_devs{$d}{to}, $srcDesc,1);
$FW_RET =~ s/\n/<br>/gs; $FW_RET =~ s/\n/<br>/gs;
return 1; return 1;
} }