[FIX] website: error managment in ace editor for ie9
authorChristophe Matthieu <chm@openerp.com>
Tue, 25 Feb 2014 16:57:20 +0000 (17:57 +0100)
committerChristophe Matthieu <chm@openerp.com>
Tue, 25 Feb 2014 16:57:20 +0000 (17:57 +0100)
bzr revid: chm@openerp.com-20140225165720-c451gumsd5mce5ya

addons/website/static/src/js/website.ace.js

index 640ed0d..a8af74b 100644 (file)
                 try {
                     var dom = new DOMParser().parseFromString(this.xml, "text/xml");
                     error = dom.getElementsByTagName("parsererror");
-                } catch (e) {
-                    error = e;
-                }
-                return error.length === 0 || error;
-            } else if (window.ActiveXObject) {
-                // TODO test in IE
+                    return error.length === 0 || $(error).text();
+                } catch (e) {}
+            }
+            if (window.ActiveXObject) {
+                // IE
                 var msDom = new ActiveXObject("Microsoft.XMLDOM");
                 msDom.async = false;
                 msDom.loadXML(this.xml);
                     def.reject("server", session, error);
                 });
             } else {
-                def.reject(null, session, $(isWellFormed).text());
+                def.reject(null, session, isWellFormed);
             }
             return def;
         },