From ab06013e30d2a8ca561874c6141b2a52dc1843b1 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 20 Sep 2016 17:21:44 +0200 Subject: [PATCH] [FIX] mass_mailing: can't change color button snippet when edit mass mailing --- addons/mass_mailing/views/snippets_themes.xml | 2 +- .../web_editor/static/lib/summernote/src/js/module/Editor.js | 4 ++-- addons/web_editor/static/src/js/widgets.js | 4 +++- addons/web_editor/static/src/less/web_editor.ui.less | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/addons/mass_mailing/views/snippets_themes.xml b/addons/mass_mailing/views/snippets_themes.xml index c718d5d2955..ac311ebfafc 100644 --- a/addons/mass_mailing/views/snippets_themes.xml +++ b/addons/mass_mailing/views/snippets_themes.xml @@ -293,7 +293,7 @@   - My Account + My Account   diff --git a/addons/web_editor/static/lib/summernote/src/js/module/Editor.js b/addons/web_editor/static/lib/summernote/src/js/module/Editor.js index a30ee9c18c8..b7ba30bfcd1 100644 --- a/addons/web_editor/static/lib/summernote/src/js/module/Editor.js +++ b/addons/web_editor/static/lib/summernote/src/js/module/Editor.js @@ -616,7 +616,6 @@ define([ var linkUrl = linkInfo.url; var linkText = linkInfo.text; var isNewWindow = linkInfo.isNewWindow; - var className = linkInfo.className || null; // ODOO: addition var rng = linkInfo.range || this.createRange($editable); var isTextChanged = rng.toString() !== linkText; @@ -647,7 +646,8 @@ define([ $.each(anchors, function (idx, anchor) { $(anchor).attr('href', linkUrl); - $(anchor).attr('class', className); // ODOO: addition + $(anchor).attr('class', linkInfo.className || null); // ODOO: addition + $(anchor).css(linkInfo.style || {}); // ODOO: addition if (isNewWindow) { $(anchor).attr('target', '_blank'); } else { diff --git a/addons/web_editor/static/src/js/widgets.js b/addons/web_editor/static/src/js/widgets.js index dcb5f58f5b8..792a9b51b95 100644 --- a/addons/web_editor/static/src/js/widgets.js +++ b/addons/web_editor/static/src/js/widgets.js @@ -1087,7 +1087,9 @@ var LinkDialog = Dialog.extend({ self.data.isNewWindow = new_window; self.data.text = label; self.data.className = classes.replace(/\s+/gi, ' ').replace(/^\s+|\s+$/gi, ''); - + if (classes.replace(/(^|[ ])(btn-default|btn-success|btn-primary|btn-info|btn-warning|btn-danger)([ ]|$)/gi, ' ')) { + self.data.style = {'background-color': '', 'color': ''}; + } self.trigger("save", self.data); }).then(_super); }, diff --git a/addons/web_editor/static/src/less/web_editor.ui.less b/addons/web_editor/static/src/less/web_editor.ui.less index 38bd5b7cd87..b464da9f70f 100644 --- a/addons/web_editor/static/src/less/web_editor.ui.less +++ b/addons/web_editor/static/src/less/web_editor.ui.less @@ -949,7 +949,7 @@ body.editor_enable { p { margin: initial; } - a, a:hover { + a:not(.btn), a:not(.btn):hover { color: inherit; } }