From aef7e363fcb1b95fdba0ee840fb988fabfea49ee Mon Sep 17 00:00:00 2001
From: MuK IT GmbH <mathias.markl@mukit.at>
Date: Sun, 2 Dec 2018 23:28:18 +0000
Subject: [PATCH] publish muk_web_utils - 12.0

---
 muk_web_utils/__manifest__.py               |  4 ++--
 muk_web_utils/static/src/js/fields/color.js | 26 +++++++++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/muk_web_utils/__manifest__.py b/muk_web_utils/__manifest__.py
index e56151e..e502a56 100644
--- a/muk_web_utils/__manifest__.py
+++ b/muk_web_utils/__manifest__.py
@@ -17,10 +17,10 @@
 #
 ###################################################################################
 
-{
+{ 
     "name": "MuK Web Utils",
     "summary": """Utility Features""",
-    "version": "12.0.2.5.1",
+    "version": "12.0.2.5.2",
     "category": "Extra Tools",
     "license": "AGPL-3",
     "author": "MuK IT",
diff --git a/muk_web_utils/static/src/js/fields/color.js b/muk_web_utils/static/src/js/fields/color.js
index eedab4f..a68cb98 100644
--- a/muk_web_utils/static/src/js/fields/color.js
+++ b/muk_web_utils/static/src/js/fields/color.js
@@ -39,10 +39,32 @@ var FieldColor = fields.InputField.extend({
     	return this._super.apply(this, arguments);
     },
     _renderEdit: function () {
-        this.$('.mk_field_color_input').val(this._formatValue(this.value));
+        this.$('.mk_field_color_input').val(
+        	this._formatValue(this.value)
+        );
+        this.$('.mk_field_color_input').css({
+        	'background-color': this._formatValue(this.value),
+        });
     },
     _renderReadonly: function () {
         this.$el.text(this._formatValue(this.value));
+        this.$el.css({'color': this._formatValue(this.value)});
+    },
+    _doAction: function() {
+    	this._super.apply(this, arguments);
+    	this.$('.mk_field_color_input').css({
+        	'background-color': this._getValue(),
+        });
+    },
+    _formatValue: function (value) {
+    	return value;
+    },
+    _parseValue: function (value) {
+    	if((/(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i).test(value)) {
+    		return value;
+    	} else {
+    		throw new Error(_.str.sprintf(core._t("'%s' is not a correct color value"), value));
+    	}
     },
     _onCustomColorButtonClick: function () {
         var ColorpickerDialog = new colorpicker(this, {
@@ -51,7 +73,7 @@ var FieldColor = fields.InputField.extend({
         });
         ColorpickerDialog.on('colorpicker:saved', this, function (event) {
         	this.$input.val(event.data.hex);
-        	this._setValue(event.data.hex);
+        	this._doAction();
         });
         ColorpickerDialog.open();
     },