diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-09-07 14:43:48 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-09-07 14:43:48 +0200 |
| commit | 49c3264ce0f73a746f9a229dba423f6c0ea3d485 (patch) | |
| tree | 9cd4603a7b9708d061802f9e0f638e5c684d15a9 /addons/web_editor/static/lib/summernote/src/js/EventHandler.js | |
| parent | b4c72220c72e22328b3a96024c59d79889b71ae5 (diff) | |
| parent | 4850fb08385de3f0851a732c97c90402e89838b7 (diff) | |
[MERGE] forward port branch saas-11.3 up to 4850fb08385
Diffstat (limited to 'addons/web_editor/static/lib/summernote/src/js/EventHandler.js')
| -rw-r--r-- | addons/web_editor/static/lib/summernote/src/js/EventHandler.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/addons/web_editor/static/lib/summernote/src/js/EventHandler.js b/addons/web_editor/static/lib/summernote/src/js/EventHandler.js index efa57f8111c..578bcfd7a0c 100644 --- a/addons/web_editor/static/lib/summernote/src/js/EventHandler.js +++ b/addons/web_editor/static/lib/summernote/src/js/EventHandler.js @@ -207,11 +207,15 @@ define([ var layoutInfo = dom.makeLayoutInfo(target); /* ODOO: (start_modification */ var $editable = layoutInfo.editable(); - if (!event.isDefaultPrevented()) { - modules.editor.saveRange($editable); + if (event.setStyleInfoFromEditable) { + var styleInfo = modules.editor.styleFromNode($editable); + } else { + if (!event.isDefaultPrevented()) { + modules.editor.saveRange($editable); + } + var styleInfo = modules.editor.currentStyle(target); } /* ODOO: end_modification) */ - var styleInfo = modules.editor.currentStyle(target); self.updateStyleInfo(styleInfo, layoutInfo); }, 0); }; |
