summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/widgets
diff options
context:
space:
mode:
authorfja-odoo <fja@odoo.com>2020-04-16 14:00:41 +0000
committerfja-odoo <fja@odoo.com>2020-05-15 11:05:00 +0000
commit99910b526ed792235a778863b993d10cf4e77cd7 (patch)
treecda8b5a4bbe7a07d8b70c3a9fbfa3505871fdb63 /addons/web/static/src/js/widgets
parenta72c9adbe5e60ba178e431e42a81334f85786942 (diff)
[IMP] web, web_editor: integrate colorpicker in colorpalette
Stop using the colorpicker dialog in the colorpalette widget. Integrate the colorpicker widget in the colorpalette widget. Of course, the colorpicker behaviors are adapted so that no useless rerendering of the colorpalette is made on each value change. The 'reset color' button is now a button like the other colors, no need for a 'color_reset' event anymore. It is removed and replaced with a 'color_picked' event with color being an empty string. The clear button now also work on hover. Also, the topbar colorpalette for text and text background colors now has the exact same behaviour as the background colorpalette: adding color preview on hover. The colorpalette now also closes on 'enter' keypress. Part of https://github.com/odoo/odoo/pull/46088 task-2195313 closes odoo/odoo#46088 Related: odoo/enterprise#8696 Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Diffstat (limited to 'addons/web/static/src/js/widgets')
-rw-r--r--addons/web/static/src/js/widgets/colorpicker.js78
1 files changed, 63 insertions, 15 deletions
diff --git a/addons/web/static/src/js/widgets/colorpicker.js b/addons/web/static/src/js/widgets/colorpicker.js
index 87a46e77a2f..6b17431259a 100644
--- a/addons/web/static/src/js/widgets/colorpicker.js
+++ b/addons/web/static/src/js/widgets/colorpicker.js
@@ -12,6 +12,8 @@ var ColorpickerWidget = Widget.extend({
xmlDependencies: ['/web/static/src/xml/colorpicker.xml'],
template: 'Colorpicker',
events: {
+ 'click': '_onClick',
+ 'keypress': '_onKeypress',
'mousedown .o_color_pick_area': '_onMouseDownPicker',
'mousedown .o_color_slider': '_onMouseDownSlider',
'mousedown .o_opacity_slider': '_onMouseDownOpacitySlider',
@@ -39,18 +41,22 @@ var ColorpickerWidget = Widget.extend({
this.sliderFlag = false;
this.opacitySliderFlag = false;
this.colorComponents = {};
-
- var self = this;
- var $body = $(document.body);
- $body.on('mousemove.colorpicker', _.throttle(function (ev) {
- self._onMouseMovePicker(ev);
- self._onMouseMoveSlider(ev);
- self._onMouseMoveOpacitySlider(ev);
- }, 10));
- $body.on('mouseup.colorpicker', _.throttle(function (ev) {
- self.pickerFlag = false;
- self.sliderFlag = false;
- self.opacitySliderFlag = false;
+ this.uniqueId = _.uniqueId('colorpicker');
+
+ // Needs to be bound on document to work in all possible cases.
+ const $document = $(document);
+ $document.on(`mousemove.${this.uniqueId}`, _.throttle((ev) => {
+ this._onMouseMovePicker(ev);
+ this._onMouseMoveSlider(ev);
+ this._onMouseMoveOpacitySlider(ev);
+ }, 50));
+ $document.on(`mouseup.${this.uniqueId}`, _.throttle((ev) => {
+ if (this.pickerFlag || this.sliderFlag || this.opacitySliderFlag) {
+ this._colorSelected();
+ }
+ this.pickerFlag = false;
+ this.sliderFlag = false;
+ this.opacitySliderFlag = false;
}, 10));
this.options = _.clone(options);
@@ -66,12 +72,17 @@ var ColorpickerWidget = Widget.extend({
this.$opacitySlider = this.$('.o_opacity_slider');
this.$opacitySliderPointer = this.$('.o_opacity_pointer');
+ const resizeObserver = new window.ResizeObserver(() => {
+ this._updateUI();
+ });
+ resizeObserver.observe(this.el);
+
var defaultColor = this.options.defaultColor || '#FF0000';
var rgba = ColorpickerWidget.convertCSSColorToRgba(defaultColor);
if (rgba) {
this._updateRgba(rgba.red, rgba.green, rgba.blue, rgba.opacity);
}
- this._updateUI();
+ this.previewActive = true;
return this._super.apply(this, arguments);
},
/**
@@ -79,7 +90,7 @@ var ColorpickerWidget = Widget.extend({
*/
destroy: function () {
this._super.apply(this, arguments);
- $(document.body).off('.colorpicker');
+ $(document).off(`.${this.uniqueId}`);
},
//--------------------------------------------------------------------------
@@ -207,6 +218,14 @@ var ColorpickerWidget = Widget.extend({
this._updateCssColor();
},
/**
+ * Trigger an event to annonce that the widget value has changed
+ *
+ * @private
+ */
+ _colorSelected: function () {
+ this.trigger_up('colorpicker_select', this.colorComponents);
+ },
+ /**
* Updates css color representation.
*
* @private
@@ -219,6 +238,9 @@ var ColorpickerWidget = Widget.extend({
_.extend(this.colorComponents,
{cssColor: ColorpickerWidget.convertRgbaToCSSColor(r, g, b, a)}
);
+ if (this.previewActive) {
+ this.trigger_up('colorpicker_preview', this.colorComponents);
+ }
},
//--------------------------------------------------------------------------
@@ -226,6 +248,26 @@ var ColorpickerWidget = Widget.extend({
//--------------------------------------------------------------------------
/**
+ * @private
+ * @param {Event} ev
+ */
+ _onKeypress: function (ev) {
+ if (ev.charCode === $.ui.keyCode.ENTER) {
+ if (ev.target.tagName === 'INPUT') {
+ this._onChangeInputs(ev);
+ }
+ ev.preventDefault();
+ this.trigger_up('enter_key_color_colorpicker');
+ }
+ },
+ /**
+ * @param {Event} ev
+ */
+ _onClick: function (ev) {
+ ev.originalEvent.__isColorpickerClick = true;
+ $(ev.target).find('> .o_opacity_pointer, > .o_slider_pointer, > .o_picker_pointer').addBack('.o_opacity_pointer, .o_slider_pointer, .o_picker_pointer').focus();
+ },
+ /**
* Updates color when the user starts clicking on the picker.
*
* @private
@@ -233,6 +275,7 @@ var ColorpickerWidget = Widget.extend({
*/
_onMouseDownPicker: function (ev) {
this.pickerFlag = true;
+ ev.preventDefault();
this._onMouseMovePicker(ev);
},
/**
@@ -265,6 +308,7 @@ var ColorpickerWidget = Widget.extend({
*/
_onMouseDownSlider: function (ev) {
this.sliderFlag = true;
+ ev.preventDefault();
this._onMouseMoveSlider(ev);
},
/**
@@ -293,6 +337,7 @@ var ColorpickerWidget = Widget.extend({
*/
_onMouseDownOpacitySlider: function (ev) {
this.opacitySliderFlag = true;
+ ev.preventDefault();
this._onMouseMoveOpacitySlider(ev);
},
/**
@@ -344,6 +389,7 @@ var ColorpickerWidget = Widget.extend({
break;
}
this._updateUI();
+ this._colorSelected();
},
});
@@ -598,7 +644,9 @@ const ColorpickerDialog = Dialog.extend({
*/
start: function () {
const proms = [this._super(...arguments)];
- this.colorPicker = new ColorpickerWidget(this, this.options);
+ this.colorPicker = new ColorpickerWidget(this, _.extend({
+ colorPreview: true,
+ }, this.options));
proms.push(this.colorPicker.appendTo(this.$el));
return Promise.all(proms);
},