Handle JsonBuilder wrappers in $ method

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 418bfdb0da6c97f29a6eddfb3226e55c0b5ce093..ba59caddb79c31084ce79d68785777756d396e62 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
@@ -33,6 +33,7 @@ import com.google.gwt.dom.client.OptionElement;
 import com.google.gwt.dom.client.SelectElement;
 import com.google.gwt.dom.client.Style.Display;
 import com.google.gwt.dom.client.TextAreaElement;
+import com.google.gwt.query.client.builders.JsonBuilder;
 import com.google.gwt.query.client.css.HasCssValue;
 import com.google.gwt.query.client.css.TakesCssValue;
 import com.google.gwt.query.client.css.TakesCssValue.CssSetter;
@@ -285,6 +286,9 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
       if (JsUtils.isElement(o)) {
         return $(JsUtils.<Element> cast(o));
       }
+      if (o instanceof JsonBuilder) {
+        return new GQuery(((JsonBuilder) o).getDataImpl());
+      }
       if (o instanceof JavaScriptObject) {
         return $((JavaScriptObject) o);
       }

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/events/EventsListener.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/events/EventsListener.java
index e48ba9bd96e4e2667233c8cc6e19d236bd40a6d6..48285d8e03dabaffd0b06d2b416d221bb3c125a7 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/events/EventsListener.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/plugins/events/EventsListener.java
@@ -14,7 +14,6 @@
 package com.google.gwt.query.client.plugins.events;
 
 import static com.google.gwt.query.client.GQuery.$;
-import static com.google.gwt.query.client.GQuery.console;
 
 import com.google.gwt.core.client.Duration;
 import com.google.gwt.dom.client.Element;