From b82a792c40e2cb0347362df10be4798797d7e7af Mon Sep 17 00:00:00 2001 From: justme-1968 <justme-1968@users.noreply.github.com> Date: Tue, 3 Feb 2015 18:03:18 +0000 Subject: [PATCH] fhemweb_colorpicker.js: allow mireds and kelvin for ct slider git-svn-id: https://svn.fhem.de/fhem/trunk@7851 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/www/pgm2/fhemweb_colorpicker.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fhem/www/pgm2/fhemweb_colorpicker.js b/fhem/www/pgm2/fhemweb_colorpicker.js index dd1320fa5..d1ca857d6 100644 --- a/fhem/www/pgm2/fhemweb_colorpicker.js +++ b/fhem/www/pgm2/fhemweb_colorpicker.js @@ -43,11 +43,18 @@ FW_colorpickerCreate(elName, devName, vArr, currVal, set, params, cmd) if( currVal ) currVal = currVal.match(/[\d.\-]*/)[0]; + if( +currVal < +vArr[2] + || +currVal > +vArr[4] ) + currVal = Math.round(1000000/currVal).toString(); + var newEl = FW_createSlider(elName, devName, ["slider",vArr[2],vArr[3],vArr[4]], currVal, set, params, cmd); - + old_set_fn = newEl.setValueFn; newEl.setValueFn = function(arg) { arg = arg.match(/[\d.\-]*/)[0]; + if( +arg < +vArr[2] + || +arg > +vArr[4] ) + arg = Math.round(1000000/arg).toString(); old_set_fn(arg); }