diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-10-17 12:09:58 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-10-17 12:09:58 +0200 |
| commit | fbdda5437a8ecb575ffbcac7961aad44c9cf4ff8 (patch) | |
| tree | 239d86ce417811cb4a0d8cbc3b278c81131f22b5 /addons/web_editor/static/src/js | |
| parent | f4332118d3156e2ba2408c1d31ab92ee2066ef73 (diff) | |
| parent | cbca27d0052430743fe2c996964d7aca0ca682c9 (diff) | |
[MERGE] forward port branch 10.0 up to cbca27d0052
Diffstat (limited to 'addons/web_editor/static/src/js')
| -rw-r--r-- | addons/web_editor/static/src/js/rte.js | 2 | ||||
| -rw-r--r-- | addons/web_editor/static/src/js/rte.summernote.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/web_editor/static/src/js/rte.js b/addons/web_editor/static/src/js/rte.js index b0366583aea..c7dc268251d 100644 --- a/addons/web_editor/static/src/js/rte.js +++ b/addons/web_editor/static/src/js/rte.js @@ -429,7 +429,7 @@ var RTE = Widget.extend({ saveElement: function ($el, context) { // remove multi edition if ($el.data('oe-model')) { - var key = $el.data('oe-model')+":"+$el.data('oe-id')+":"+$el.data('oe-field')+":"+$el.data('oe-type')+":"+$el.data('oe-expression'); + var key = $el.data('oe-model')+":"+$el.data('oe-id')+":"+$el.data('oe-field')+":"+$el.data('oe-type')+":"+$el.data('oe-expression')+":"+$el.data('oe-xpath'); if (this.__saved[key]) return $.when(); this.__saved[key] = true; } diff --git a/addons/web_editor/static/src/js/rte.summernote.js b/addons/web_editor/static/src/js/rte.summernote.js index 4ab1e7bed06..a3bf079aa30 100644 --- a/addons/web_editor/static/src/js/rte.summernote.js +++ b/addons/web_editor/static/src/js/rte.summernote.js @@ -454,7 +454,7 @@ $.summernote.pluginEvents.visible = function (event, editor, layoutInfo) { if (($node.is('[data-oe-type="html"]') || $node.is('[data-oe-field="arch"]')) && $node.hasClass("o_editable") && !$node[0].children.length && - "h1 h2 h3 h4 h5 h6 p b bold i u code sup strong small pre th td".toUpperCase().indexOf($node[0].nodeName) === -1) { + "h1 h2 h3 h4 h5 h6 p b bold i u code sup strong small pre th td label".toUpperCase().indexOf($node[0].nodeName) === -1) { var p = $('<p><br/></p>')[0]; $node.append( p ); range.createFromNode(p.firstChild).select(); |