Only use the CanonicalizationMethod/InclusiveNameSpace if one was not

explicitly provided

Author: bazzadp

lib/exclusive-canonicalization.js

@@ -202,32 +202,33 @@ ExclusiveCanonicalization.prototype.process = function(node, options) {
   var ancestorNamespaces = options.ancestorNamespaces || [];
 
   /**
-   * Get the InclusiveNamespaces PrefixList
-   */
-  var inclusiveNamespacesPrefixList  = options.inclusiveNamespacesPrefixList || [];
-  var CanonicalizationMethod = utils.findChilds(node, "CanonicalizationMethod")
-  if (CanonicalizationMethod.length!=0) {
-    var inclusiveNamespaces = utils.findChilds(CanonicalizationMethod[0], "InclusiveNamespaces")
-    if (inclusiveNamespaces.length!=0) {
-      inclusiveNamespacesPrefixList = inclusiveNamespaces[0].getAttribute('PrefixList').split(" ");
-	}
+   * If the inclusiveNamespacesPrefixList has not been explicitly provided then look it up in CanonicalizationMethod/InclusiveNamespaces
+   */  
+  if (inclusiveNamespacesPrefixList.length == 0) {
+    var CanonicalizationMethod = utils.findChilds(node, "CanonicalizationMethod")
+    if (CanonicalizationMethod.length != 0) {
+      var inclusiveNamespaces = utils.findChilds(CanonicalizationMethod[0], "InclusiveNamespaces")
+      if (inclusiveNamespaces.length != 0) {
+          inclusiveNamespacesPrefixList = inclusiveNamespaces[0].getAttribute('PrefixList').split(" ");
+      }
+    }
   }
 
   /**
    * If you have a PrefixList then use it and the ancestors to add the necessary namespaces
    */
-    if (inclusiveNamespacesPrefixList) {
-      var prefixList = inclusiveNamespacesPrefixList instanceof Array ? inclusiveNamespacesPrefixList : inclusiveNamespacesPrefixList.split(' ');
-      prefixList.forEach(function (prefix) {
-        if (ancestorNamespaces)  {
-          ancestorNamespaces.forEach(function (ancestorNamespace) {
-            if (prefix == ancestorNamespace.prefix) {
-              node.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:' + prefix, ancestorNamespace.namespaceURI);
-            }
-          })
-        }
-      })
-    }
+  if (inclusiveNamespacesPrefixList) {
+    var prefixList = inclusiveNamespacesPrefixList instanceof Array ? inclusiveNamespacesPrefixList : inclusiveNamespacesPrefixList.split(' ');
+    prefixList.forEach(function (prefix) {
+      if (ancestorNamespaces)  {
+        ancestorNamespaces.forEach(function (ancestorNamespace) {
+          if (prefix == ancestorNamespace.prefix) {
+            node.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:' + prefix, ancestorNamespace.namespaceURI);
+          }
+        })
+      }
+    })
+  }
 
   var res = this.processInner(node, [], defaultNs, defaultNsForPrefix, inclusiveNamespacesPrefixList);
   return res;