2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-20 13:26:02 +00:00

Dont create a slider for webCmd pct 30

git-svn-id: https://svn.fhem.de/fhem/trunk@3114 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2013-04-25 08:34:20 +00:00
parent 427691be28
commit 0720ea49ce

View File

@ -1084,7 +1084,7 @@ FW_showRoom()
$htmlTxt = &{$data{webCmdFn}{$fn}}($FW_wname,
$d, $FW_room, $cmd, $values);
use strict "refs";
last if($htmlTxt);
last if(defined($htmlTxt));
}
}
if($htmlTxt) {
@ -2456,7 +2456,8 @@ FW_sliderFn($$$)
{
my ($FW_wname, $d, $FW_room, $cmd, $values) = @_;
return undef if($values !~ m/^slider,(.*),(.*),(.*)$/ || $cmd =~ m/ /);
return undef if($values !~ m/^slider,(.*),(.*),(.*)$/);
return "" if($cmd =~ m/ /); # webCmd pct 30 should generate a link
my ($min,$stp, $max) = ($1, $2, $3);
my $srf = $FW_room ? "&room=$FW_room" : "";
my $cv = ReadingsVal($d, $cmd, Value($d));
@ -2480,6 +2481,7 @@ FW_timepickerFn()
my ($FW_wname, $d, $FW_room, $cmd, $values) = @_;
return undef if($values ne "time");
return "" if($cmd =~ m/ /); # webCmd on-for-timer 30 should generate a link
my $srf = $FW_room ? "&room=$FW_room" : "";
my $cv = ReadingsVal($d, $cmd, Value($d));
$cmd = "" if($cmd eq "state");
@ -2495,6 +2497,7 @@ FW_dropdownFn()
{
my ($FW_wname, $d, $FW_room, $cmd, $values) = @_;
return "" if($cmd =~ m/ /); # webCmd temp 30 should generate a link
my @tv = split(",", $values);
# Hack: eventmap (translation only) should not result in a
# dropdown. eventMap/webCmd/etc handling must be cleaned up.