Update Wicked Good XPath to ce916fcfaf97247e3b8ec6cada64a6f6687175b4

This updates Wicked Good XPath to the 1.3.0 release. Notable changes
include:

1. Fixed a bug in IE8 compatibility introduced by the 1.2 release.
2. Fixed a check for node.style so that it won't mutate the DOM on
   IE < 9.
3. The library now performs wgxpath.install on Document.prototype if
   available. This allows document.evaluate to also work on XMLDocument.

Fixes #1907.

Signed-off-by: Jim Evans <[email protected]>

Author: Dominator008

third_party/js/wgxpath/nameTest.js

@@ -100,8 +100,10 @@ wgxpath.NameTest.prototype.matches = function(node) {
       type != goog.dom.NodeType.ATTRIBUTE) {
     return false;
   }
+  // TODO(moz): Investigate if node.localName is necessary.
+  var localName = goog.isDef(node.localName) ? node.localName : node.nodeName;
   if (this.name_ != wgxpath.NameTest.WILDCARD &&
-      this.name_ != node.localName.toLowerCase()) {
+      this.name_ != localName.toLowerCase()) {
     return false;
   } else {
     if (this.namespaceUri_ == wgxpath.NameTest.WILDCARD) {

third_party/js/wgxpath/step.js

@@ -360,9 +360,11 @@ wgxpath.Step.Axis = {
         var nodeset = new wgxpath.NodeSet();
         var testName = test.getName();
         // IE8 doesn't allow access to the style attribute using getNamedItem.
-        // It returns an object with nodeValue = null.
-        if (testName == 'style' && node.style &&
-            wgxpath.userAgent.IE_DOC_PRE_9) {
+        // It returns an object with nodeValue = null. Even worse, ".style" on
+        // IE8 can mutate the DOM, adding an empty string attribute. Therefore
+        // we check it last.
+        if (testName == 'style' &&
+            wgxpath.userAgent.IE_DOC_PRE_9 && node.style) {
           nodeset.add(wgxpath.IEAttrWrapper.forStyleOf(
               /** @type {!Node} */ (node), node.sourceIndex));
           return nodeset;

third_party/js/wgxpath/wgxpath.js

@@ -48,10 +48,9 @@ goog.require('wgxpath.nsResolver');
 /**
  * Enum for XPathResult types.
  *
- * @private
  * @enum {number}
  */
-wgxpath.XPathResultType_ = {
+wgxpath.XPathResultType = {
   ANY_TYPE: 0,
   NUMBER_TYPE: 1,
   STRING_TYPE: 2,
@@ -115,44 +114,44 @@ wgxpath.XPathExpression_ = function(expr, nsResolver) {
  * @private
  */
 wgxpath.XPathResult_ = function(value, type) {
-  if (type == wgxpath.XPathResultType_.ANY_TYPE) {
+  if (type == wgxpath.XPathResultType.ANY_TYPE) {
     if (value instanceof wgxpath.NodeSet) {
-      type = wgxpath.XPathResultType_.UNORDERED_NODE_ITERATOR_TYPE;
+      type = wgxpath.XPathResultType.UNORDERED_NODE_ITERATOR_TYPE;
     } else if (typeof value == 'string') {
-      type = wgxpath.XPathResultType_.STRING_TYPE;
+      type = wgxpath.XPathResultType.STRING_TYPE;
     } else if (typeof value == 'number') {
-      type = wgxpath.XPathResultType_.NUMBER_TYPE;
+      type = wgxpath.XPathResultType.NUMBER_TYPE;
     } else if (typeof value == 'boolean') {
-      type = wgxpath.XPathResultType_.BOOLEAN_TYPE;
+      type = wgxpath.XPathResultType.BOOLEAN_TYPE;
     } else {
       throw Error('Unexpected evaluation result.');
     }
   }
-  if (type != wgxpath.XPathResultType_.STRING_TYPE &&
-      type != wgxpath.XPathResultType_.NUMBER_TYPE &&
-      type != wgxpath.XPathResultType_.BOOLEAN_TYPE &&
+  if (type != wgxpath.XPathResultType.STRING_TYPE &&
+      type != wgxpath.XPathResultType.NUMBER_TYPE &&
+      type != wgxpath.XPathResultType.BOOLEAN_TYPE &&
       !(value instanceof wgxpath.NodeSet)) {
     throw Error('value could not be converted to the specified type');
   }
   this['resultType'] = type;
   var nodes;
   switch (type) {
-    case wgxpath.XPathResultType_.STRING_TYPE:
+    case wgxpath.XPathResultType.STRING_TYPE:
       this['stringValue'] = (value instanceof wgxpath.NodeSet) ?
           value.string() : '' + value;
       break;
-    case wgxpath.XPathResultType_.NUMBER_TYPE:
+    case wgxpath.XPathResultType.NUMBER_TYPE:
       this['numberValue'] = (value instanceof wgxpath.NodeSet) ?
           value.number() : +value;
       break;
-    case wgxpath.XPathResultType_.BOOLEAN_TYPE:
+    case wgxpath.XPathResultType.BOOLEAN_TYPE:
       this['booleanValue'] = (value instanceof wgxpath.NodeSet) ?
           value.getLength() > 0 : !!value;
       break;
-    case wgxpath.XPathResultType_.UNORDERED_NODE_ITERATOR_TYPE:
-    case wgxpath.XPathResultType_.ORDERED_NODE_ITERATOR_TYPE:
-    case wgxpath.XPathResultType_.UNORDERED_NODE_SNAPSHOT_TYPE:
-    case wgxpath.XPathResultType_.ORDERED_NODE_SNAPSHOT_TYPE:
+    case wgxpath.XPathResultType.UNORDERED_NODE_ITERATOR_TYPE:
+    case wgxpath.XPathResultType.ORDERED_NODE_ITERATOR_TYPE:
+    case wgxpath.XPathResultType.UNORDERED_NODE_SNAPSHOT_TYPE:
+    case wgxpath.XPathResultType.ORDERED_NODE_SNAPSHOT_TYPE:
       var iter = value.iterator();
       nodes = [];
       for (var node = iter.next(); node; node = iter.next()) {
@@ -162,8 +161,8 @@ wgxpath.XPathResult_ = function(value, type) {
       this['snapshotLength'] = value.getLength();
       this['invalidIteratorState'] = false;
       break;
-    case wgxpath.XPathResultType_.ANY_UNORDERED_NODE_TYPE:
-    case wgxpath.XPathResultType_.FIRST_ORDERED_NODE_TYPE:
+    case wgxpath.XPathResultType.ANY_UNORDERED_NODE_TYPE:
+    case wgxpath.XPathResultType.FIRST_ORDERED_NODE_TYPE:
       var firstNode = value.getFirst();
       this['singleNodeValue'] =
           firstNode instanceof wgxpath.IEAttrWrapper ?
@@ -174,36 +173,36 @@ wgxpath.XPathResult_ = function(value, type) {
   }
   var index = 0;
   this['iterateNext'] = function() {
-    if (type != wgxpath.XPathResultType_.UNORDERED_NODE_ITERATOR_TYPE &&
-        type != wgxpath.XPathResultType_.ORDERED_NODE_ITERATOR_TYPE) {
+    if (type != wgxpath.XPathResultType.UNORDERED_NODE_ITERATOR_TYPE &&
+        type != wgxpath.XPathResultType.ORDERED_NODE_ITERATOR_TYPE) {
       throw Error('iterateNext called with wrong result type');
     }
     return (index >= nodes.length) ? null : nodes[index++];
   };
   this['snapshotItem'] = function(i) {
-    if (type != wgxpath.XPathResultType_.UNORDERED_NODE_SNAPSHOT_TYPE &&
-        type != wgxpath.XPathResultType_.ORDERED_NODE_SNAPSHOT_TYPE) {
+    if (type != wgxpath.XPathResultType.UNORDERED_NODE_SNAPSHOT_TYPE &&
+        type != wgxpath.XPathResultType.ORDERED_NODE_SNAPSHOT_TYPE) {
       throw Error('snapshotItem called with wrong result type');
     }
     return (i >= nodes.length || i < 0) ? null : nodes[i];
   };
 };
-wgxpath.XPathResult_['ANY_TYPE'] = wgxpath.XPathResultType_.ANY_TYPE;
-wgxpath.XPathResult_['NUMBER_TYPE'] = wgxpath.XPathResultType_.NUMBER_TYPE;
-wgxpath.XPathResult_['STRING_TYPE'] = wgxpath.XPathResultType_.STRING_TYPE;
-wgxpath.XPathResult_['BOOLEAN_TYPE'] = wgxpath.XPathResultType_.BOOLEAN_TYPE;
+wgxpath.XPathResult_['ANY_TYPE'] = wgxpath.XPathResultType.ANY_TYPE;
+wgxpath.XPathResult_['NUMBER_TYPE'] = wgxpath.XPathResultType.NUMBER_TYPE;
+wgxpath.XPathResult_['STRING_TYPE'] = wgxpath.XPathResultType.STRING_TYPE;
+wgxpath.XPathResult_['BOOLEAN_TYPE'] = wgxpath.XPathResultType.BOOLEAN_TYPE;
 wgxpath.XPathResult_['UNORDERED_NODE_ITERATOR_TYPE'] =
-    wgxpath.XPathResultType_.UNORDERED_NODE_ITERATOR_TYPE;
+    wgxpath.XPathResultType.UNORDERED_NODE_ITERATOR_TYPE;
 wgxpath.XPathResult_['ORDERED_NODE_ITERATOR_TYPE'] =
-    wgxpath.XPathResultType_.ORDERED_NODE_ITERATOR_TYPE;
+    wgxpath.XPathResultType.ORDERED_NODE_ITERATOR_TYPE;
 wgxpath.XPathResult_['UNORDERED_NODE_SNAPSHOT_TYPE'] =
-    wgxpath.XPathResultType_.UNORDERED_NODE_SNAPSHOT_TYPE;
+    wgxpath.XPathResultType.UNORDERED_NODE_SNAPSHOT_TYPE;
 wgxpath.XPathResult_['ORDERED_NODE_SNAPSHOT_TYPE'] =
-    wgxpath.XPathResultType_.ORDERED_NODE_SNAPSHOT_TYPE;
+    wgxpath.XPathResultType.ORDERED_NODE_SNAPSHOT_TYPE;
 wgxpath.XPathResult_['ANY_UNORDERED_NODE_TYPE'] =
-    wgxpath.XPathResultType_.ANY_UNORDERED_NODE_TYPE;
+    wgxpath.XPathResultType.ANY_UNORDERED_NODE_TYPE;
 wgxpath.XPathResult_['FIRST_ORDERED_NODE_TYPE'] =
-    wgxpath.XPathResultType_.FIRST_ORDERED_NODE_TYPE;
+    wgxpath.XPathResultType.FIRST_ORDERED_NODE_TYPE;
 
 
 
@@ -230,7 +229,7 @@ wgxpath.XPathNSResolver_ = function(node) {
  */
 wgxpath.install = function(opt_win, opt_force) {
   var win = opt_win || goog.global;
-  var doc = win.document;
+  var doc = (win.Document && win.Document.prototype) || win.document;
 
   // Unless opt_force is true, installation is a noop if native XPath is
   // available.