diff options
| author | qsm-odoo <qsm@odoo.com> | 2016-05-24 12:15:44 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2016-05-24 17:49:14 +0200 |
| commit | ea2e0eea786a13b92dd0c72a70bff5ddd5e7b1bb (patch) | |
| tree | 416f752b1152811f86e1db14c9f80c2061ab6ffb /addons/web_editor/static/src | |
| parent | d35d8c3fca2c240014b92a0796e22c3dfd13d824 (diff) | |
[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.
Diffstat (limited to 'addons/web_editor/static/src')
| -rw-r--r-- | addons/web_editor/static/src/js/snippets.options.js | 8 |
1 files 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"); }); } }); |
