summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/lib/summernote/src
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@odoo.com>2016-09-20 17:21:44 +0200
committerChristophe Matthieu <chm@odoo.com>2016-09-21 16:14:49 +0200
commitab06013e30d2a8ca561874c6141b2a52dc1843b1 (patch)
tree8e85c2f130a5c8afeb9c1f49794992fd90d4eb8f /addons/web_editor/static/lib/summernote/src
parent5b4c1d405d4f2118c088eed39b5c6ffa600361c2 (diff)
[FIX] mass_mailing: can't change color button snippet when edit mass mailing
Diffstat (limited to 'addons/web_editor/static/lib/summernote/src')
-rw-r--r--addons/web_editor/static/lib/summernote/src/js/module/Editor.js4
1 files changed, 2 insertions, 2 deletions
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 {