diff options
| author | Gery Debongnie <ged@openerp.com> | 2014-04-30 16:04:23 +0200 |
|---|---|---|
| committer | Gery Debongnie <ged@openerp.com> | 2014-04-30 16:04:23 +0200 |
| commit | a6b25061ba461c12b22a8945e43134a0bc79d5ee (patch) | |
| tree | 60b5e702f1f31324e36d2d51b7b1b777994b2cb4 /addons/web/static/src/js/core.js | |
| parent | 1f693aaed6f6e28a384f20d357f8a3f558d33f6a (diff) | |
| parent | 7dedde91eff41752724efcbbefa5e0ca7e1ae3e0 (diff) | |
[MERGE] merge from trunk
bzr revid: ged@openerp.com-20140430085942-umusyhp4cs2ffezj
bzr revid: ged@openerp.com-20140430140423-kq0vdboq1mux4zfn
Diffstat (limited to 'addons/web/static/src/js/core.js')
| -rw-r--r-- | addons/web/static/src/js/core.js | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index a4bcd1922de..74866112d99 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -460,14 +460,11 @@ instance.web.Session.include( /** @lends instance.web.Session# */{ .appendTo(document.body) .load(function () { try { - if (options.error) { - if (!this.contentDocument.body.childNodes[1]) { - options.error(this.contentDocument.body.childNodes); - } - else { - options.error(JSON.parse(this.contentDocument.body.childNodes[1].textContent)); - } - } + if (options.error) { + var body = this.contentDocument.body; + var node = body.childNodes[1] || body.childNodes[0]; + options.error(JSON.parse(node.textContent)); + } } finally { complete(); } |