From 59bbabeac248d57f1760f676920d6ab354474771 Mon Sep 17 00:00:00 2001
From: Ellert <>
Date: Fri, 27 Oct 2017 22:05:16 +0000
Subject: [PATCH] fhemweb_iconRadio.js,fhemweb.iconButtons: better fix for
 empty icon color

git-svn-id: https://svn.fhem.de/fhem/trunk@15332 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/www/pgm2/fhemweb_iconButtons.js | 8 +++++---
 fhem/www/pgm2/fhemweb_iconRadio.js   | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/fhem/www/pgm2/fhemweb_iconButtons.js b/fhem/www/pgm2/fhemweb_iconButtons.js
index 17467596f..a7be41eee 100644
--- a/fhem/www/pgm2/fhemweb_iconButtons.js
+++ b/fhem/www/pgm2/fhemweb_iconButtons.js
@@ -73,9 +73,11 @@ FW_iconButtonsCreate(elName, devName, vArr, currVal, set, params, cmd)
 
     var ico = vArr[ind*ipar+3];
     var m = ico.match(/.*@(.*)/);
-    var uscol = m && m[1] ? m[1] : "";
+    var uscol = m && m[1] ? m[1] : "none";
     if( uscol.match(/^[A-F0-9]{6}$/))
       uscol = "#"+uscol;
+    if(uscol == 'none')
+      ico += "@none";
     $(val).find("span").attr( "unselectcolor",uscol);
 
     FW_cmd(FW_root+"?cmd={FW_makeImage('"+ico+"')}&XHR=1",function(data){
@@ -83,7 +85,7 @@ FW_iconButtonsCreate(elName, devName, vArr, currVal, set, params, cmd)
       $(newEl).find("label").each(function(ind,val){
         var span = $(val).find("span");
         var sc = $(span).attr("selectcolor");
-        var usc = $(span).attr("unselectcolor");
+        var usc = $(span).attr("unselectcolor") == "none" ? "" : $(span).attr("unselectcolor");
         var isc = $(span).attr("ischecked");
         var re = new RegExp("\"\s?"+$(val).attr("name")+"(\s?|\")","i");
         if (!(data.match(re) === null) && ($(val).find("span").html().match(re) === null)) {
@@ -137,7 +139,7 @@ FW_iconButtonsCreate(elName, devName, vArr, currVal, set, params, cmd)
                                       var button = buttons[i];
                                       var span = button.next().find("span");
                                       var sc = $(span).attr("selectcolor");
-                                      var usc = $(span).attr("unselectcolor");
+                                      var usc = $(span).attr("unselectcolor") == "none" ? "" : $(span).attr("unselectcolor");
                                       if( usc.match(/^[A-F0-9]{6}$/))
                                         usc = "#"+usc;
                                       button.prop("checked", arg.match(new RegExp('(^|,)'+vArr[i*ipar+2]+'($|,)') ) );
diff --git a/fhem/www/pgm2/fhemweb_iconRadio.js b/fhem/www/pgm2/fhemweb_iconRadio.js
index a9139e14c..c61507b9e 100644
--- a/fhem/www/pgm2/fhemweb_iconRadio.js
+++ b/fhem/www/pgm2/fhemweb_iconRadio.js
@@ -75,9 +75,11 @@ FW_iconRadioCreate(elName, devName, vArr, currVal, set, params, cmd)
 
     var ico = vArr[ind*ipar+3];
     var m = ico.match(/.*@(.*)/);
-    var uscol = m && m[1] ? m[1] : "";
+    var uscol = m && m[1] ? m[1] : "none";
     if( uscol.match(/^[A-F0-9]{6}$/))
       uscol = "#"+uscol;
+    if(uscol == 'none')
+      ico += "@none";
     $(val).find("span").attr( "unselectcolor",uscol);
 
     FW_cmd(FW_root+"?cmd={FW_makeImage('"+ico+"')}&XHR=1",function(data){
@@ -85,7 +87,7 @@ FW_iconRadioCreate(elName, devName, vArr, currVal, set, params, cmd)
       $(newEl).find("label").each(function(ind,val){
         var span = $(val).find("span");
         var sc = $(span).attr("selectcolor");
-        var usc = $(span).attr("unselectcolor");
+        var usc = $(span).attr("unselectcolor") == "none" ? "" : $(span).attr("unselectcolor");
         var isc = $(span).attr("ischecked");
         // console.log("span usc_"+ind+": "+usc+", sc_"+ind+": "+sc);
         var re = new RegExp("\"\s?"+$(val).attr("name")+"(\s?|\")","i");
@@ -145,7 +147,7 @@ FW_iconRadioCreate(elName, devName, vArr, currVal, set, params, cmd)
                                       var button = buttons[i];
                                       var span = button.next().find("span");
                                       var sc = $(span).attr("selectcolor");
-                                      var usc = $(span).attr("unselectcolor");
+                                      var usc = $(span).attr("unselectcolor") == "none" ? "" : $(span).attr("unselectcolor");
                                       if( usc.match(/^[A-F0-9]{6}$/))
                                         usc = "#"+usc;
                                       // console.log("setFn usc_"+i+": "+usc+" sc_"+i+": "+sc);