[IMP] enable CKEDITOR on every element, seems to work acceptably well for now

potential problem: toolbar allowing creation of block elements inside inlines

bzr revid: xmo@openerp.com-20130813132547-pxcm6jvodabv7xc6
This commit is contained in:
Xavier Morel
2013-08-13 15:25:47 +02:00
parent c5d941ffc0
commit 744e7214d5
2 changed files with 4 additions and 2 deletions
+1 -1
View File
@@ -97,7 +97,7 @@ instance.website.EditorBar = instance.web.Widget.extend({
.not('.oe_snippet_editor')
.prop('contentEditable', true)
.addClass('oe_editable');
var $rte_ables = $editables.filter('div, p, li, section, header, footer').not('[data-oe-type]');
var $rte_ables = $editables.not('[data-oe-type]');
var $raw_editables = $editables.not($rte_ables);
// temporary fix until we fix ckeditor
+3 -1
View File
@@ -28,7 +28,9 @@
<script type="text/javascript" src="/website/static/lib/ckeditor.sharedspace/plugin.js"></script>
<script type="text/javascript">
CKEDITOR.disableAutoInline = true;
CKEDITOR.dtd.$editable.li = 1;
// EDIT ALL THE THINGS
CKEDITOR.dtd.$editable = $.extend(
{}, CKEDITOR.dtd.$block, CKEDITOR.dtd.$inline);
</script>
<t t-if="editable">