summaryrefslogtreecommitdiff
path: root/addons/web/static
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-04-24 12:53:34 +0200
committerChristophe Simonis <chs@odoo.com>2017-04-24 12:53:34 +0200
commit64b7d4e8a8df180bc598e2df56992d373e23b44b (patch)
treee5683925601ffc151d185b374cd8b4a713d23def /addons/web/static
parent7350a50a2eb41f8df595b4791edfe5ee3f06de63 (diff)
parent3f6e573c67a2ef6cbaf9bbeda1d0a2f286809266 (diff)
[MERGE] forward port branch 10.0 up to 3f6e573c67a
Diffstat (limited to 'addons/web/static')
-rw-r--r--addons/web/static/lib/qweb/qweb2.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/web/static/lib/qweb/qweb2.js b/addons/web/static/lib/qweb/qweb2.js
index 1e854a6960c..378c5eb6023 100644
--- a/addons/web/static/lib/qweb/qweb2.js
+++ b/addons/web/static/lib/qweb/qweb2.js
@@ -129,12 +129,15 @@ var QWeb2 = {
}
return r.join('');
} else {
+ // avoid XMLSerializer with text node for IE
+ if (node.nodeType == 3) {
+ return node.data;
+ }
if (typeof XMLSerializer !== 'undefined') {
return (new XMLSerializer()).serializeToString(node);
} else {
switch(node.nodeType) {
case 1: return node.outerHTML;
- case 3: return node.data;
case 4: return '<![CDATA[' + node.data + ']]>';
case 8: return '<!-- ' + node.data + '-->';
}