summaryrefslogtreecommitdiff
path: root/addons/web_editor/static
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-04-25 13:33:01 +0200
committerChristophe Simonis <chs@odoo.com>2016-04-25 13:33:01 +0200
commit4d337f72ed59d1e5260fa2bb4f3d238e6ed11415 (patch)
tree27c372b98741474c11d4867f90e4e94b6af05cde /addons/web_editor/static
parent7b1c208d5fba483b0ffa95319ebda323bc20ceb0 (diff)
parentac7beb3d7bd356042f046d7fc22ad261eedf33e7 (diff)
[MERGE] forward port of branch 9.0 up to ac7beb3
Diffstat (limited to 'addons/web_editor/static')
-rw-r--r--addons/web_editor/static/src/js/rte.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/js/rte.js b/addons/web_editor/static/src/js/rte.js
index becaf978d17..6df552a5ebd 100644
--- a/addons/web_editor/static/src/js/rte.js
+++ b/addons/web_editor/static/src/js/rte.js
@@ -205,7 +205,7 @@ var history = new History();
$.extend($.expr[':'],{
o_editable: function(node,i,m){
while (node) {
- if (node.className) {
+ if (node.className && _.isString(node.className)) {
if (node.className.indexOf('o_not_editable')!==-1 ) {
return false;
}