FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-09 01:34:19 +00:00
Code Issues Releases Wiki Activity

FHEMWEB: fix detail-attr preselect when devname contains dot (Forum #32064)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7544 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-01-13 13:54:17 +00:00
parent 920e5b9064
commit 1155c27b1f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/FHEM/01_FHEMWEB.pm
View File

@ -927,8 +927,9 @@ FW_makeTable($$$@)
} else {
if( $title eq "Attributes" ) {
my $id = "sel_attr$name"; $id =~ s/\./_/g;
FW_pO "<td><div class=\"dname\">".
"<a onClick='FW_querySetSelected(\"sel_attr$name\",\"$n\")'>".
"<a onClick='FW_querySetSelected(\"$id\",\"$n\")'>".
"$n</a></div></td>";
} else {
FW_pO "<td><div class=\"dname\">$n</div></td>";
@ -988,6 +989,7 @@ sub
FW_detailSelect($$$$)
{
my ($d, $cmd, $list,$class) = @_;
Log 1, "$cmd $d $list";
return if(!$list || $FW_hiddenroom{input});
my @al = sort map { s/:.*//;$_ } split(" ", $list);
@ -1573,6 +1575,7 @@ FW_select($$$$$@)
{
my ($id, $name, $valueArray, $selected, $class, $jSelFn) = @_;
$jSelFn = ($jSelFn ? "onchange=\"$jSelFn\"" : "");
$id =~ s/\./_/g; # to avoid problems in JS DOM Search
$id = ($id ? "id=\"$id\" informId=\"$id\"" : "");
my $s = "<select $jSelFn $id name=\"$name\" class=\"$class\">";
foreach my $v (@{$valueArray}) {

1
fhem/www/pgm2/fhemweb.js
View File

@ -507,6 +507,7 @@ FW_replaceWidget(oldEl, devName, vArr, currVal, reading, set, params, cmd)
function
FW_queryValue(cmd, el)
{
log("FW_queryValue:"+cmd);
var query = location.pathname+"?cmd="+cmd+"&XHR=1";
query = addcsrf(query);
var qConn = new XMLHttpRequest();