diff options
| author | Xavier Morel <xmo@openerp.com> | 2013-12-17 16:37:51 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2013-12-17 16:37:51 +0100 |
| commit | 128f1e1281a640d21cb4ef7b587f66fdffc4ce7f (patch) | |
| tree | fbef76e8d432257a171aca07ea815013fd8c7891 | |
| parent | 68f0397609d3fbc68318a10712b18b7f968c9870 (diff) | |
[FIX] odd behavior in cke widgets
in "block-level" widgets (divs), when hitting [return] instead of
adding a newline in the widget a new bit of widget may be added. This
is caused by an incompability between widgets and the enterKey plugin.
Remove enterKey, behavior on [Return] is slightly worse (always
inserts br) but widgets don't get broken.
See https://dev.ckeditor.com/ticket/11326 for issue in upstream.
bzr revid: xmo@openerp.com-20131217153751-7fbwp34o8kac9x94
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 1e3ef0da66a..c7c5620c9a4 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -859,7 +859,7 @@ var plugins = [ 'a11yhelp', 'basicstyles', 'blockquote', 'clipboard', 'colorbutton', 'colordialog', 'dialogadvtab', - 'elementspath', 'enterkey', 'entities', 'filebrowser', + 'elementspath', /*'enterkey',*/ 'entities', 'filebrowser', 'find', 'floatingspace','format', 'htmlwriter', 'iframe', 'indentblock', 'indentlist', 'justify', 'list', 'pastefromword', 'pastetext', 'preview', |