[MERGE] with trunk-website-al

bzr revid: chm@openerp.com-20130731093853-ynkbq3zm7588d2rr
2013-07-31 11:38:53 +02:00
parent 6a908b390e 444db71456
commit 6d58cda2fa
1 changed files with 6 additions and 1 deletions
@@ -43,7 +43,10 @@ instance.website.EditorBar = instance.web.Widget.extend({
            .parent().show();
        // TODO: span edition changing edition state (save button)
        var $editables = $('[data-oe-model]')
-                .not('link, script').prop('contentEditable', true)
+                .not('link, script')
+                // FIXME: propagation should make "meta" blocks non-editable in the first place...
+                .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 $raw_editables = $editables.not($rte_ables);
@@ -327,6 +330,8 @@ instance.website.RTE = instance.web.Widget.extend({
            customConfig: '',
            // Disable ACF
            allowedContent: true,
+            // Don't insert paragraphs around content in e.g. <li>
+            autoParagraph: false,
        };
    },
    // TODO clean