diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-07-31 11:38:53 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-07-31 11:38:53 +0200 |
| commit | 6d58cda2faec9a0f9151fdb12bbe3c2a03e75575 (patch) | |
| tree | df62410a8513bdd86a0574bc306e9d81343a46d3 /addons/website/static | |
| parent | 6a908b390e55393694d2b45f66603608e932dc61 (diff) | |
| parent | 444db7145616c0533fe3e1611b1d261f769d0ba5 (diff) | |
[MERGE] with trunk-website-al
bzr revid: chm@openerp.com-20130731093853-ynkbq3zm7588d2rr
Diffstat (limited to 'addons/website/static')
| -rw-r--r-- | addons/website/static/src/js/website.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index b7efa4d2535..277c9b4143f 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -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 |