diff options
| author | Xavier Morel <xmo@openerp.com> | 2013-12-05 12:39:08 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2013-12-05 12:39:08 +0100 |
| commit | a1ecb6923b8673f9f4e00f4e27e0a6a12491edd8 (patch) | |
| tree | bd6c253de0ebe89d3553809e16d25d3ae10b2581 /addons/website/static/src | |
| parent | 04045c369931ea0c4359ddff0196c163dc5e6db5 (diff) | |
[ADD] saving of oddly localized/formatted stuff
bzr revid: xmo@openerp.com-20131205113908-9tr575ejn7hanhi7
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/css/editor.css | 4 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 14 |
2 files changed, 12 insertions, 6 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index 487306be5dc..eaf1fdbe96b 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -206,10 +206,6 @@ ul.oe_menu_editor .disclose { position: static !important; } -.cke_widget_drag_handler_container { - display: none !important; -} - .cke_widget_editable:empty:after { content: " "; white-space: pre-wrap; diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index b7bc451009b..6269013dd25 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -326,8 +326,18 @@ draggable: false, upcast: function (el) { - return el.attributes['data-oe-type'] - && el.attributes['data-oe-type'] !== 'monetary'; + var matches = el.attributes['data-oe-type'] && el.attributes['data-oe-type'] !== 'monetary'; + if (!matches) { return false; } + + if (el.attributes['data-oe-original']) { + while (el.children.length) { + el.children[0].remove(); + } + el.add(new CKEDITOR.htmlParser.text( + el.attributes['data-oe-original'] + )); + } + return true; }, }); editor.widgets.add('monetary', { |