diff options
| author | Xavier Morel <xmo@openerp.com> | 2013-12-04 17:28:05 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2013-12-04 17:28:05 +0100 |
| commit | 04045c369931ea0c4359ddff0196c163dc5e6db5 (patch) | |
| tree | ab6315a439605dff185223937592f2e7ce29a83b /addons/website/static/src | |
| parent | 5179f6ecc8a749f3413127fe5c4b6b9ee7117ac9 (diff) | |
[IMP] use ckeditor 4.3 final feature to disable widget draghandle entirely instead of relying on CSS
bzr revid: xmo@openerp.com-20131204162805-rikk5kbbx304tol6
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/css/editor.sass | 3 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 7de48fdc611..885b1c9372c 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -168,9 +168,6 @@ ul.oe_menu_editor // Breaks completely horribly crazy products listing page, so take it out. .cke_widget_wrapper position: static !important -// "remove" drag & drop of CKE widgets -.cke_widget_drag_handler_container - display: none !important // prevent inline widgets from entirely disappearing when their (textual) // content is removed .cke_widget_editable:empty:after diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index a834f5f8162..b7bc451009b 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -323,6 +323,7 @@ init: function (editor) { editor.widgets.add('oeref', { editables: { text: '*' }, + draggable: false, upcast: function (el) { return el.attributes['data-oe-type'] @@ -331,6 +332,7 @@ }); editor.widgets.add('monetary', { editables: { text: 'span.oe_currency_value' }, + draggable: false, upcast: function (el) { return el.attributes['data-oe-type'] === 'monetary'; |