diff --git a/fhem/CHANGED b/fhem/CHANGED
index 74f7f69cf..51f701c02 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII
- SVN
+ - feature: FHEMWEB use widget module to update colorpicker in longpoll
- feature: FHEMWEB widget (slider/etc) javascript handler modularized
- feature: FHEMWEB longpoll in multiple browserwindows
- feature: fhem.pl: version command added
diff --git a/fhem/FHEM/31_HUEDevice.pm b/fhem/FHEM/31_HUEDevice.pm
index 91744a520..559e0c9a9 100644
--- a/fhem/FHEM/31_HUEDevice.pm
+++ b/fhem/FHEM/31_HUEDevice.pm
@@ -135,7 +135,7 @@ HUEDevice_colorpickerFn($$$)
} else {
my $c = "\"$FW_ME?cmd=set $d $cmd %$srf\"";
return '
'.
- "".
+ "".
' | ';
}
}
diff --git a/fhem/www/jscolor/jscolor.js b/fhem/www/jscolor/jscolor.js
index c7918ce33..b7fe3d682 100644
--- a/fhem/www/jscolor/jscolor.js
+++ b/fhem/www/jscolor/jscolor.js
@@ -992,17 +992,4 @@ var jscolor = {
};
-function
-setColor(el,mode,cmd)
-{
- var v = el.color;
- if(mode=="HSV") {
- v = (0x100 | Math.round(42*el.color.hsv[0])).toString(16).substr(1) +
- (0x100 | Math.round(255*el.color.hsv[1])).toString(16).substr(1) +
- (0x100 | Math.round(255*el.color.hsv[2])).toString(16).substr(1);
- }
- if(cmd)
- document.location = cmd.replace('%',v);
-}
-
jscolor.install();
diff --git a/fhem/www/pgm2/fhemweb_colorpicker.js b/fhem/www/pgm2/fhemweb_colorpicker.js
new file mode 100644
index 000000000..3057f24c1
--- /dev/null
+++ b/fhem/www/pgm2/fhemweb_colorpicker.js
@@ -0,0 +1,28 @@
+
+function
+FW_colorpickerUpdateLine(d)
+{
+ el = document.getElementById(name);
+
+ if(el) {
+ el.setAttribute('value', '#d');
+ }
+}
+
+function
+colorpicker_setColor(el,mode,cmd)
+{
+ var v = el.color;
+ if(mode=="HSV") {
+ v = (0x100 | Math.round(42*el.color.hsv[0])).toString(16).substr(1) +
+ (0x100 | Math.round(255*el.color.hsv[1])).toString(16).substr(1) +
+ (0x100 | Math.round(255*el.color.hsv[2])).toString(16).substr(1);
+ }
+ if(cmd)
+ document.location = cmd.replace('%',v);
+}
+
+FW_widgets['colorpicker'] = {
+ updateLine:FW_colorpickerUpdateLine
+};
+