diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-22 14:23:07 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-22 14:23:07 +0200 |
| commit | b1b700adb1f26bb43e8f4b77b85f969a4b52d36c (patch) | |
| tree | fd1febbefe6cdb41fb2a063fec4af3718860b9a9 /addons/web_editor/static/lib/summernote | |
| parent | 5a0a29b5285ea8f18716f936d58960b9b5c0f0d9 (diff) | |
| parent | 6854887ade204c635fb99a16275f7e0ca664697a (diff) | |
[MERGE] forward port branch saas-11 up to 6854887
Diffstat (limited to 'addons/web_editor/static/lib/summernote')
| -rw-r--r-- | addons/web_editor/static/lib/summernote/src/js/module/Editor.js | 4 |
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 { |