diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-01-22 18:47:13 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-01-22 18:47:13 +0100 |
| commit | 6f841038f33176bb89ac5bd4083703d95eed1ff2 (patch) | |
| tree | aa4c309e98dd2bf39408f2752a7764c9ef9dea54 /addons/web/static/src/js/core.js | |
| parent | 5f987f87457fac54935388e7dde86dbef3affcc5 (diff) | |
| parent | 373539425e268f41d7d74e3f4e6f9d622863dcd4 (diff) | |
[MERGE] forward port of branch 8.0 up to 3735394
Diffstat (limited to 'addons/web/static/src/js/core.js')
| -rw-r--r-- | addons/web/static/src/js/core.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index bbbc59d7bd5..ef7523ee440 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -437,7 +437,8 @@ instance.web.Session.include( /** @lends instance.web.Session# */{ try { if (options.error) { var body = this.contentDocument.body; - var node = body.childNodes[1] || body.childNodes[0]; + var nodes = body.children.length === 0 ? body.childNodes : body.children; + var node = nodes[1] || nodes[0]; options.error(JSON.parse(node.textContent)); } } finally { |