]> source.dussan.org Git - gwtquery.git/commitdiff
Merge branch 'master' into mcm_styling
authorManolo Carrasco <manolo@apache.org>
Fri, 2 Jan 2015 13:17:01 +0000 (14:17 +0100)
committerManolo Carrasco <manolo@apache.org>
Fri, 2 Jan 2015 13:17:01 +0000 (14:17 +0100)
Conflicts:
gwtquery-core/src/main/java/com/google/gwt/query/client/IsProperties.java
gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonFactoryJre.java

1  2 
gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
gwtquery-core/src/main/java/com/google/gwt/query/client/IsProperties.java
gwtquery-core/src/main/java/com/google/gwt/query/client/Properties.java
gwtquery-core/src/main/java/com/google/gwt/query/client/builders/JsonBuilderBase.java
gwtquery-core/src/main/java/com/google/gwt/query/client/js/JsUtils.java
gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java
gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonFactoryJre.java

index aadfa6560e12d64fce01df1bac39ac09b923478f,57f5a9097082c2df77935cf325e6b9b2767adfc1..a33f676b8f1b560db52a186eddf1604662ee8e5f
@@@ -19,14 -19,14 +19,19 @@@ import com.google.gwt.core.client.JavaS
  import com.google.gwt.core.client.JsArray;
  import com.google.gwt.query.client.IsProperties;
  import com.google.gwt.query.client.Properties;
+ import com.google.gwt.query.client.js.JsCache;
  import com.google.gwt.query.client.js.JsObjectArray;
  import com.google.gwt.query.client.js.JsUtils;
+ import com.google.gwt.user.client.Window;
+ import java.util.Arrays;
+ import java.util.List;
  
 +/**
 + * Common class for all JsonBuilder implementations.
 + *
 + * @param <J>
 + */
  public abstract class JsonBuilderBase<J extends JsonBuilderBase<?>> implements JsonBuilder {
  
    protected Properties p = Properties.create();
index ba20b2383d468cc7e707e4c555587fe06335be97,d1833d66f2ee689e261d0409371f5291ec0d4c36..13520fe400e4d2655cb6225e8f0236809c4b6643
@@@ -362,10 -347,10 +362,10 @@@ public class JsUtils 
    }
  
    /**
 -   * Check is a javascript object can be cast to an Element
 +   * Check is a javascript object can be cast to an Element.
     */
    public static native boolean isElement(Object o) /*-{
-     return o && o.nodeType && o.nodeName ? true : false;
+     return !!o && 'nodeType' in o && 'nodeName' in o;
    }-*/;
  
    /**
index 33106c05ebcfb32dbeea2bec793f9f0a9ae38dd8,54e8aab34ca10bc16d81009b9a80ec152903c9de..66a8f5bce9a922f81f0afe379ee42bd52b007112
@@@ -49,9 -17,9 +32,9 @@@ import elemental.json.impl.JreJsonNull
   * It uses java.util.reflect.Proxy to implement JsonBuilders
   * and elemental light weight json to handle json data.
   */
 -public class JsonFactoryJre implements JsonFactory  {
 +public class JsonFactoryJre implements JsonFactory {
  
-   static JsonFactoryJre jsonFactory = new JsonFactoryJre();
+  
  
    /**
     * Although functions cannot be serialized to json we use JsonBuilders