FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 10:46:53 +00:00
Code Issues Releases Wiki Activity

fhemweb_iconRadio.js,fhemweb.iconButtons: better fix for empty icon color

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15332 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Ellert 2017-10-27 22:05:16 +00:00
parent aa09b46784
commit 59bbabeac2
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/www/pgm2/fhemweb_iconButtons.js
View File

@ -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]+'($|,)') ) );

8
fhem/www/pgm2/fhemweb_iconRadio.js
View File

@ -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);