xpath selectors available when using SelectorEngineCssToXPath

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
index 7ef58ec545d0a02cca6f662bf23dc29f7808042c..625521c77c9a02bbaaa8d3c6fe1d4151aa03255d 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
@@ -138,8 +138,6 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
 \r
   private static SelectorEngine engine;\r
   \r
-  private static HasSelector xpahtEngine;\r
-\r
   private static final int FUNC_PREPEND = 0, FUNC_APPEND = 1, FUNC_AFTER = 2,\r
       FUNC_BEFORE = 3;\r
 \r
@@ -492,14 +490,8 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
     if (engine == null) {\r
       engine = new SelectorEngine();\r
     }\r
-    HasSelector impl = engine;\r
-    if (selector.startsWith("./") || selector.startsWith("/")) {\r
-      if (xpahtEngine == null) {\r
-        impl = xpahtEngine =  engine.impl instanceof SelectorEngineCssToXPath ? \r
-            engine.impl : new SelectorEngineCssToXPath();\r
-      }\r
-    }\r
-    NodeList<Element> n = impl.select(selector, context == null ? document : context);\r
+    \r
+    NodeList<Element> n = engine.select(selector, context == null ? document : context);\r
     JsNodeArray res = copyNodeList(n);\r
 \r
     currentSelector = selector;\r

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngine.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngine.java
index 386f38ead25f3249ecdc8ec5e55f23be7c8553d5..8451be10636f1a1ddb8d36c89405cf2718bcf80c 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngine.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngine.java
@@ -86,6 +86,7 @@ public class SelectorEngine implements HasSelector {
 \r
   public SelectorEngine() {\r
     impl = (SelectorEngineImpl) GWT.create(SelectorEngineImpl.class);\r
+    System.out.println("Create SelectorEngineImpl " + impl.getClass().getName());\r
   }\r
 \r
   public Node getRoot() {\r

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineNative.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineNative.java
index dddcdc376b7c50d359d0d27cd7d0025450fcf3c5..e020f2a19a7906640496c29bcb400bc8d33932c3 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineNative.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/impl/SelectorEngineNative.java
@@ -26,13 +26,15 @@ import com.google.gwt.dom.client.NodeList;
  */
 public class SelectorEngineNative extends SelectorEngineImpl {
 
-  public static String NATIVE_EXCEPTIONS_REGEXP = ".*(\\.//|:contains|!=|:first([^-]|$)|:last([^-]|$)|:even|:odd).*";
+  // querySelectorAll unsupported selectors 
+  public static String NATIVE_EXCEPTIONS_REGEXP = "(^[\\./]/.*)|(.*(:contains|!=|:first([^-]|$)|:last([^-]|$)|:even|:odd)).*";
   
   private static HasSelector impl;
   
   public SelectorEngineNative() {
     if (impl == null) {
       impl = GWT.create(HasSelector.class);
+      System.out.println("Created HasSelector: " + impl.getClass().getName());
     }
   }