diff options
| author | dbh <dbh@odoo.com> | 2017-02-02 15:01:49 +0530 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2017-06-14 17:49:56 +0200 |
| commit | 137c4f5d76b55c3dd3c4f593de484aadfcf5e6da (patch) | |
| tree | b32c5366c1b2300341ab4635d159402053f0b572 /addons/web_editor/static/src/js/rte.summernote.js | |
| parent | 6ad2ae30354a77c0f898cb9cb5a859713061d71a (diff) | |
[IMP] web_editor: improve icon color edition
- Make sure icon colors can be edited the same way as text
- Improve recent color behavior
Diffstat (limited to 'addons/web_editor/static/src/js/rte.summernote.js')
| -rw-r--r-- | addons/web_editor/static/src/js/rte.summernote.js | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/addons/web_editor/static/src/js/rte.summernote.js b/addons/web_editor/static/src/js/rte.summernote.js index 8ff0effb86b..811c3e23a9f 100644 --- a/addons/web_editor/static/src/js/rte.summernote.js +++ b/addons/web_editor/static/src/js/rte.summernote.js @@ -67,8 +67,8 @@ renderer.createPalette = function ($container, options) { var $palettes = $container.find(".note-color .note-color-palette"); $palettes.prepend(html); - var $bg = $palettes.first().find("button:not(.note-color-btn)").addClass("note-color-btn"); - var $fore = $palettes.last().find("button:not(.note-color-btn)").addClass("note-color-btn"); + var $bg = $palettes.filter(":even").find("button:not(.note-color-btn)").addClass("note-color-btn"); + var $fore = $palettes.filter(":odd").find("button:not(.note-color-btn)").addClass("note-color-btn"); $bg.each(function () { var $el = $(this); var className = 'bg-' + $el.data('color'); @@ -146,10 +146,7 @@ renderer.tplPopovers = function (lang, options) { })).appendTo($resizefa); } var $colorfa = $airPopover.find('.note-color').clone(); - $colorfa.find(".btn-group:first").remove(); $colorfa.find("ul.dropdown-menu").css('min-width', '172px'); - $colorfa.find('button[data-event="color"]').attr('data-value', '{"foreColor": "#f00"}') - .find("i").css({'background': '', 'color': '#f00'}); $resizefa.after($colorfa); // show dialog box and delete |
