From fbdad83ba804d2a411ab1ef900ef26b5f6355ee5 Mon Sep 17 00:00:00 2001
From: justme1968 <justme1968@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Tue, 3 Feb 2015 17:06:30 +0000
Subject: [PATCH] colorpicker: fixed longpoll updates if reading contains more
 than one value              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
---
 fhem/www/pgm2/brightstyle.css        |  1 +
 fhem/www/pgm2/darkstyle.css          |  1 +
 fhem/www/pgm2/defaultCommon.css      |  1 +
 fhem/www/pgm2/fhemweb_colorpicker.js | 16 +++++++++++++++-
 fhem/www/pgm2/ios6Common.css         |  1 +
 fhem/www/pgm2/ios7Common.css         |  1 +
 6 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/fhem/www/pgm2/brightstyle.css b/fhem/www/pgm2/brightstyle.css
index c5642d652..6f5854a64 100644
--- a/fhem/www/pgm2/brightstyle.css
+++ b/fhem/www/pgm2/brightstyle.css
@@ -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; }
diff --git a/fhem/www/pgm2/darkstyle.css b/fhem/www/pgm2/darkstyle.css
index eb4373801..4478e1d33 100644
--- a/fhem/www/pgm2/darkstyle.css
+++ b/fhem/www/pgm2/darkstyle.css
@@ -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; }
diff --git a/fhem/www/pgm2/defaultCommon.css b/fhem/www/pgm2/defaultCommon.css
index 558e35efd..ac5b23715 100644
--- a/fhem/www/pgm2/defaultCommon.css
+++ b/fhem/www/pgm2/defaultCommon.css
@@ -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; }
diff --git a/fhem/www/pgm2/fhemweb_colorpicker.js b/fhem/www/pgm2/fhemweb_colorpicker.js
index f9fba2d52..dd1320fa5 100644
--- a/fhem/www/pgm2/fhemweb_colorpicker.js
+++ b/fhem/www/pgm2/fhemweb_colorpicker.js
@@ -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" ) {
diff --git a/fhem/www/pgm2/ios6Common.css b/fhem/www/pgm2/ios6Common.css
index 34abd95e8..c684c93af 100644
--- a/fhem/www/pgm2/ios6Common.css
+++ b/fhem/www/pgm2/ios6Common.css
@@ -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; }
diff --git a/fhem/www/pgm2/ios7Common.css b/fhem/www/pgm2/ios7Common.css
index e72ee4f2a..aa07afa97 100644
--- a/fhem/www/pgm2/ios7Common.css
+++ b/fhem/www/pgm2/ios7Common.css
@@ -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; }