diff options
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/widgets/colorpicker_dialog.js | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/addons/web/static/src/js/widgets/colorpicker_dialog.js b/addons/web/static/src/js/widgets/colorpicker_dialog.js index d6314c6b8b3..bf0d656a8c6 100644 --- a/addons/web/static/src/js/widgets/colorpicker_dialog.js +++ b/addons/web/static/src/js/widgets/colorpicker_dialog.js @@ -23,6 +23,7 @@ var ColorpickerDialog = Dialog.extend({ * @param {Widget} parent * @param {Object} [options] * @param {string} [options.defaultColor='#FF0000'] + * @param {string} [options.noTransparency=false] */ init: function (parent, options) { options = options || {}; @@ -125,13 +126,15 @@ var ColorpickerDialog = Dialog.extend({ var y = this.colorComponents.hue * height / 360; this.$colorSliderPointer.css('top', Math.round(y - 2)); - // Update opacity slider position - var heightOpacity = this.$opacitySlider.height(); - var z = heightOpacity * (1 - this.colorComponents.opacity / 100.0); - this.$opacitySliderPointer.css('top', Math.round(z - 2)); + if (! this.options.noTransparency) { + // Update opacity slider position + var heightOpacity = this.$opacitySlider.height(); + var z = heightOpacity * (1 - this.colorComponents.opacity / 100.0); + this.$opacitySliderPointer.css('top', Math.round(z - 2)); - // Add gradient color on opacity slider - this.$opacitySlider.css('background', 'linear-gradient(' + this.colorComponents.hex + ' 0%, transparent 100%)'); + // Add gradient color on opacity slider + this.$opacitySlider.css('background', 'linear-gradient(' + this.colorComponents.hex + ' 0%, transparent 100%)'); + } }, /** * Updates colors according to given hex value. Opacity is left unchanged. @@ -300,7 +303,7 @@ var ColorpickerDialog = Dialog.extend({ * @param {Event} ev */ _onMouseMoveOpacitySlider: function (ev) { - if (!this.opacitySliderFlag) { + if (!this.opacitySliderFlag || this.options.noTransparency) { return; } |