diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-05-03 18:47:49 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-05-03 18:47:49 +0200 |
| commit | 04acf0cc7ccd4ff500cac6187c6be3f28f272fd2 (patch) | |
| tree | ff659994848ebdef19010bb72d74801ac50c9a07 /addons/web_editor/static/src/js | |
| parent | 8d9c054842b5fbaa205c7658c25cf66320b8e197 (diff) | |
| parent | 2420492c26410c2d01cd18bacbbf2fb2d76f7f80 (diff) | |
[MERGE] forward port branch saas-12.1 up to 2420492c264
Diffstat (limited to 'addons/web_editor/static/src/js')
| -rw-r--r-- | addons/web_editor/static/src/js/wysiwyg_snippets/snippets.editor.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/js/wysiwyg_snippets/snippets.editor.js b/addons/web_editor/static/src/js/wysiwyg_snippets/snippets.editor.js index b8c6057bb0e..7240d2db40d 100644 --- a/addons/web_editor/static/src/js/wysiwyg_snippets/snippets.editor.js +++ b/addons/web_editor/static/src/js/wysiwyg_snippets/snippets.editor.js @@ -920,7 +920,7 @@ var SnippetsMenu = Widget.extend({ && (float_next === 'left' || float_next === 'right')) { zone.remove(); } else if (disp_prev !== null && disp_next !== null - && disp_prev !== 'block' && disp_next !== 'block') { + && disp_prev.indexOf('inline') >= 0 && disp_next.indexOf('inline') >= 0) { zone.remove(); } }); |