diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-05-03 09:16:50 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-05-03 09:16:50 +0200 |
| commit | 62017de41e733b470de9518ba9cd39a09e249cf4 (patch) | |
| tree | 5fb5954ab956e1a0de1e977fe9f142904a14d805 /addons/web_editor | |
| parent | 9c1ad3604e2cc508f9c8fbda9aaf77b9a8fcb82c (diff) | |
| parent | d7c0c5c127b9bc80a447768370c7915487e7292f (diff) | |
[MERGE] forward port branch 12.0 up to d7c0c5c127b
Diffstat (limited to 'addons/web_editor')
| -rw-r--r-- | addons/web_editor/static/src/js/editor/snippets.editor.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/js/editor/snippets.editor.js b/addons/web_editor/static/src/js/editor/snippets.editor.js index 651e71f63a5..672c28febff 100644 --- a/addons/web_editor/static/src/js/editor/snippets.editor.js +++ b/addons/web_editor/static/src/js/editor/snippets.editor.js @@ -811,7 +811,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(); } }); |