summaryrefslogtreecommitdiff
path: root/addons/web_editor
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-02-01 19:08:14 +0100
committerChristophe Simonis <chs@odoo.com>2017-02-01 19:08:14 +0100
commitb7c7591bfba41eba5be43ec490d6da9a2c7368fe (patch)
tree09b22c9ec50a23906dff793dc9001880ff0a7d56 /addons/web_editor
parentb34917cd6d7dfd7d29ce207dcb2f70c5f491f2b4 (diff)
parent71773e1f1cbc619da78c16ced4acd880dc685e3c (diff)
[MERGE] forward port branch saas-11 up to 71773e1f1cb
Diffstat (limited to 'addons/web_editor')
-rw-r--r--addons/web_editor/static/src/js/translator.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/addons/web_editor/static/src/js/translator.js b/addons/web_editor/static/src/js/translator.js
index 4fd9825567f..bc431f3ba55 100644
--- a/addons/web_editor/static/src/js/translator.js
+++ b/addons/web_editor/static/src/js/translator.js
@@ -177,6 +177,10 @@ var Translate = Widget.extend({
},
rte_changed: function (node) {
var $node = $(node);
+ $node.find("p").each(function () { // remove <p/> element which might have been inserted because of copy-paste
+ var $p = $(this);
+ $p.after($p.html()).remove();
+ });
var trans = this.getTranlationObject($node[0]);
$node.toggleClass('o_dirty', trans.value !== $node.html().replace(/[ \t\n\r]+/, ' '));
},