From cb87fd10f837f8e1b8dd86fe335f32015edbc355 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Mon, 8 Sep 2014 14:45:10 +0000 Subject: [PATCH] FHEMWEB: do not reload the page on dropdown change (Forum #26313) git-svn-id: https://svn.fhem.de/fhem/trunk@6520 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_CUL.pm | 1 - fhem/FHEM/01_FHEMWEB.pm | 13 +++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/fhem/FHEM/00_CUL.pm b/fhem/FHEM/00_CUL.pm index 4e3ddd47f..02eaccbee 100755 --- a/fhem/FHEM/00_CUL.pm +++ b/fhem/FHEM/00_CUL.pm @@ -674,7 +674,6 @@ CUL_SendFromQueue($$) my ($hash, $bstring) = @_; my $name = $hash->{NAME}; my $hm = ($bstring =~ m/^A/); - my $mz = ($bstring =~ m/^Z/); my $to = ($hm ? 0.15 : 0.3); my $now = gettimeofday(); if($bstring ne "") { diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index 65ad174dd..00874fc66 100755 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -2489,15 +2489,12 @@ FW_dropdownFn() $fpname =~ s/.*floorplan\/(\w+)$/$1/; #allow usage of attr fp_setbutton my $fwsel; $fwsel = ($cmd eq "state" ? "" : "$cmd ") . - FW_select("$d-$cmd","val.$d", \@tv, $txt,"dropdown","submit()"). - FW_hidden("cmd.$d", "set"); - $fwsel .= FW_hidden("fwcsrf", $defs{$FW_wname}{CSRFTOKEN}) if($FW_CSRF); + FW_select("$d-$cmd","val.$d", \@tv, $txt,"dropdown", + "FW_cmd('$FW_ME?XHR=1&cmd.$d=set $d '+ ". + "this.options[this.selectedIndex].value+ ' &room=$FW_room')"); + return "". + "$fwsel"; - return "
". - FW_hidden("arg.$d", $cmd) . - FW_hidden("dev.$d", $d) . - ($FW_room ? FW_hidden("room", $FW_room) : "") . - "$fwsel
"; } return undef; }