From ea2e0eea786a13b92dd0c72a70bff5ddd5e7b1bb Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Tue, 24 May 2016 12:15:44 +0200 Subject: [PATCH] [FIX] web_editor: snippet colorpicker option When going over the colorpicker when no bg-* class was selected yet, the bg-undefined class was added on the snippet. Also, when clicking on the reset button, the bg-* class was removed but the selected button in the colorpicker was not unselected. --- addons/web_editor/static/src/js/snippets.options.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/web_editor/static/src/js/snippets.options.js b/addons/web_editor/static/src/js/snippets.options.js index 811d0e9c175..3f933f4c191 100644 --- a/addons/web_editor/static/src/js/snippets.options.js +++ b/addons/web_editor/static/src/js/snippets.options.js @@ -344,8 +344,11 @@ odoo.define('web_editor.snippets.options', function (require) { self.$target.removeClass(self.classes).addClass('bg-' + $(this).data("color")); }) .mouseleave(function () { - self.$target.removeClass(self.classes) - .addClass('bg-' + $colors.filter(".selected").data("color")); + self.$target.removeClass(self.classes); + var $selected = $colors.filter(".selected"); + if ($selected.length) { + self.$target.addClass('bg-' + $selected.data("color")); + } }) .click(function () { $colors.removeClass("selected"); @@ -355,6 +358,7 @@ odoo.define('web_editor.snippets.options', function (require) { this.$el.find('.note-color-reset').on('click', function () { self.$target.removeClass(self.classes); + $colors.removeClass("selected"); }); } });