From b4c7b747c346a069e53c67bc97619bb10c68a187 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Mon, 24 Feb 2014 10:36:47 +0000 Subject: [PATCH] FHEMWEB: allow space in room selector (from justme1968) git-svn-id: https://svn.fhem.de/fhem/trunk@5037 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/01_FHEMWEB.pm | 2 +- fhem/www/pgm2/fhemweb_multiple.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index d4e4de2e3..9217f32f8 100755 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -914,7 +914,7 @@ FW_doDetail($) FW_makeTable("Readings", $d, $h->{READINGS}); my $attrList = getAllAttr($d); - my $roomList = "multiple,".join(",", sort grep !/ /, keys %FW_rooms); + my $roomList = "multiple,".join(",", sort map { $_ =~ s/ /#/g ;$_} keys %FW_rooms); $attrList =~ s/room /room:$roomList /; FW_makeSelect($d, "attr", $attrList,"attr"); diff --git a/fhem/www/pgm2/fhemweb_multiple.js b/fhem/www/pgm2/fhemweb_multiple.js index 3806558eb..d4f5d97bd 100644 --- a/fhem/www/pgm2/fhemweb_multiple.js +++ b/fhem/www/pgm2/fhemweb_multiple.js @@ -8,7 +8,8 @@ FW_multipleSelChange(name, devName, vArr) o.newEl = document.createElement('select'); o.newEl.setAttribute('multiple', true); for(var j=1; j < vArr.length; j++) { - o.newEl.options[j-1] = new Option(vArr[j], vArr[j]); + var s = vArr[j].replace(/#/g," "); + o.newEl.options[j-1] = new Option(s, s); } o.qFn = 'FW_multipleSetSelected(qArg, "%")'; o.qArg = o.newEl; @@ -26,7 +27,7 @@ FW_multipleSetSelected(el, val) for(var i=0;i