XMLUtils JS : add methods tests to avoid lazy exception catching.

pydio · Jun 20, 2016 · b2bf0a8 · b2bf0a8
1 parent 095529d
commit b2bf0a8
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/core/src/plugins/gui.ajax/res/js/es6/util/XMLUtils.es6 b/core/src/plugins/gui.ajax/res/js/es6/util/XMLUtils.es6
@@ -37,10 +37,12 @@ class XMLUtils{
      * @signature function(element, query)
      */
     static XPathSelectSingleNode(element, query){
-        try{
+        if(element.selectSingleNode){
-            var res = element.selectSingleNode(query);
+            try{
-            if(res) return res;
+                var res = element.selectSingleNode(query);
-        }catch(e){}
+                if(res) return res;
+            }catch(e){}
+        }
 
         if(!XMLUtils.__xpe) {
             try{
@@ -74,17 +76,19 @@ class XMLUtils{
      * @signature function(element, query)
      */
     static XPathSelectNodes(element, query){
-        try{
+        if(element.selectNodes){
             try{
-                if(element.ownerDocument){
+                try{
-                    element.ownerDocument.setProperty("SelectionLanguage", "XPath");
+                    if(element.ownerDocument && element.ownerDocument.setProperty){
-                }else{
+                        element.ownerDocument.setProperty("SelectionLanguage", "XPath");
-                    element.setProperty("SelectionLanguage", "XPath");
+                    }else if(element.setProperty){
-                }
+                        element.setProperty("SelectionLanguage", "XPath");
+                    }
+                }catch(e){}
+                var res = Array.from(element.selectNodes(query));
+                if(res) return res;
             }catch(e){}
-            var res = Array.from(element.selectNodes(query));
+        }
-            if(res) return res;
-        }catch(e){}
 
         var xpe = XMLUtils.__xpe;