Make focusInput detect textareas as well, and refactor the XPath code.

Together with e2f3b54, this closes issue #276.

1 files changed, 19 insertions, 0 deletions

diff --git a/lib/utils.js b/lib/utils.js
index 0c992ad4..ef961833 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -11,4 +11,23 @@ var utils = {
     var func = obj[components.pop()];
     return func.apply(obj, argArray);
   },
+
+  /*
+   * Takes an array of XPath selectors, adds the necessary namespaces (currently only XHTML), and applies them
+   * to the document root. The namespaceResolver in evaluateXPath should be kept in sync with the namespaces
+   * here.
+   */
+  makeXPath: function(elementArray) {
+    var xpath = [];
+    for (var i in elementArray)
+      xpath.push("//" + elementArray[i], "//xhtml:" + elementArray[i]);
+    return xpath.join(" | ");
+  },
+
+  evaluateXPath: function(xpath, resultType) {
+    function namespaceResolver(namespace) {
+      return namespace == "xhtml" ? "http://www.w3.org/1999/xhtml" : null;
+    }
+    return document.evaluate(xpath, document.documentElement, namespaceResolver, resultType, null);
+  },
 };