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

colorpicker: fixed longpoll updates if reading contains more than one value

Browse Source 
use correct background image for colortemperature in mired instead of kelvin


git-svn-id: https://svn.fhem.de/fhem/trunk@7849 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2015-02-03 17:06:30 +00:00
parent ef88ffc6f0
commit ce1cf8c03a
6 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/www/pgm2/brightstyle.css
View File

@ -77,6 +77,7 @@ div.dval { margin-left:10px; }
.colorpicker_ct .slider { background: url(../jscolor/ct_background.svg); }
.colorpicker_ct_mired .slider { background: url(../jscolor/ct_mired_background.svg); }
.colorpicker_hue .slider { background: url(../jscolor/hue_background.svg); }
.get,.set,.attr { margin-bottom:5px; float:left; }
select.svgSrc { width:100px; }

1
fhem/www/pgm2/darkstyle.css
View File

@ -96,6 +96,7 @@ g.on { fill:red; }
.colorpicker_ct .slider { background: url(../jscolor/ct_background.svg); }
.colorpicker_ct_mired .slider { background: url(../jscolor/ct_mired_background.svg); }
.colorpicker_hue .slider { background: url(../jscolor/hue_background.svg); }
.get,.set,.attr { margin-bottom:5px; float:left; }
select.svgSrc { width:100px; }

1
fhem/www/pgm2/defaultCommon.css
View File

@ -38,6 +38,7 @@ div.block { border:1px solid gray; background: #F8F8E0; padding:0.7em; }
select { margin-left:5px; margin-right:5px; }
.slider { float:left; width:250px; height:26px; }
.colorpicker_ct .slider { background: url(../jscolor/ct_background.svg); }
.colorpicker_ct_mired .slider { background: url(../jscolor/ct_mired_background.svg); }
.colorpicker_hue .slider { background: url(../jscolor/hue_background.svg); }
.get,.set,.attr { margin-bottom:5px; float:left; }
select.svgSrc { width:100px; }

16
fhem/www/pgm2/fhemweb_colorpicker.js
View File

@ -27,6 +27,7 @@ FW_colorpickerCreate(elName, devName, vArr, currVal, set, params, cmd)
//console.log( "mode: "+mode );
//preset ?
if( params && params.length ) {
var color = params[0];
if( mode == "CT" )
@ -39,8 +40,21 @@ FW_colorpickerCreate(elName, devName, vArr, currVal, set, params, cmd)
}
if( mode == "CT" ) {
if( currVal )
currVal = currVal.match(/[\d.\-]*/)[0];
var newEl = FW_createSlider(elName, devName, ["slider",vArr[2],vArr[3],vArr[4]], currVal, set, params, cmd);
$(newEl).addClass("colorpicker_ct");
old_set_fn = newEl.setValueFn;
newEl.setValueFn = function(arg) {
arg = arg.match(/[\d.\-]*/)[0];
old_set_fn(arg);
}
if( vArr[4] < 1000 )
$(newEl).addClass("colorpicker_ct_mired");
else
$(newEl).addClass("colorpicker_ct");
return newEl;
} else if( mode == "HUE" ) {

1
fhem/www/pgm2/ios6Common.css
View File

@ -224,6 +224,7 @@ background-image: linear-gradient(to bottom, #C0E2FC 0%, #44AAF8 2%, #0589F5 4%,
}
.colorpicker_ct .slider { background: url(../jscolor/ct_background.svg); }
.colorpicker_ct_mired .slider { background: url(../jscolor/ct_mired_background.svg); }
.colorpicker_hue .slider { background: url(../jscolor/hue_background.svg); }
.get,.set,.attr { margin-bottom:5px; float:left; }
select.svgSrc { width:100px; }

1
fhem/www/pgm2/ios7Common.css
View File

@ -6,6 +6,7 @@ div.ui-dialog div.ui-dialog-titlebar { display:none; }
div.ui-widget-content { font-family:Helvetica; background:white; color:#151515;}
.colorpicker_ct .slider { background: url(../jscolor/ct_background.svg); }
.colorpicker_ct_mired .slider { background: url(../jscolor/ct_mired_background.svg); }
.colorpicker_hue .slider { background: url(../jscolor/hue_background.svg); }
.get,.set,.attr { margin-bottom:5px; float:left; }
select.svgSrc { width:100px; }