diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2013-07-31 09:49:33 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2013-07-31 09:49:33 +0200 |
| commit | 7f8aacf82cf67329474ce9df8a230048757c3f0f (patch) | |
| tree | 2511aa7af87ad146e0adfa55b8052463e330dbdc /addons/website/static/src | |
| parent | dc7230517dd84f8147f74df6d802ae1c3bc1278b (diff) | |
| parent | d616e2d5fe06a9317f15afd1ffecb60f6056b2af (diff) | |
[MERGE] from upstream
bzr revid: fva@openerp.com-20130731074933-sd1ngn65e0jusqww
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/css/editor.css | 1 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index e431b3db571..eca9a2edc22 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -1,3 +1,4 @@ +@charset "utf-8"; .oe_website_editorbar { position: fixed; top: 0; diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index e7a42877dcc..21fd393aab2 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -45,7 +45,7 @@ instance.website.EditorBar = instance.web.Widget.extend({ var $editables = $('[data-oe-model]') .not('link, script').prop('contentEditable', true) .addClass('oe_editable'); - var $rte_ables = $editables.filter('div, p, li').not('[data-oe-type]'); + var $rte_ables = $editables.filter('div, p, li, section').not('[data-oe-type]'); var $raw_editables = $editables.not($rte_ables); this.rte.start_edition($rte_ables); |