From: Manolo Carrasco <manolo@apache.org>
Date: Fri, 2 Jan 2015 13:17:01 +0000 (+0100)
Subject: Merge branch 'master' into mcm_styling
X-Git-Tag: gwtquery-project-1.4.3~5^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bbb781795cb27391483139dda2166717b751b778;p=gwtquery.git

Merge branch 'master' into mcm_styling

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
---

bbb781795cb27391483139dda2166717b751b778
diff --cc gwtquery-core/src/main/java/com/google/gwt/query/client/builders/JsonBuilderBase.java
index aadfa656,57f5a909..a33f676b
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/builders/JsonBuilderBase.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/builders/JsonBuilderBase.java
@@@ -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();
diff --cc gwtquery-core/src/main/java/com/google/gwt/query/client/js/JsUtils.java
index ba20b238,d1833d66..13520fe4
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/js/JsUtils.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/js/JsUtils.java
@@@ -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;
    }-*/;
  
    /**
diff --cc gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonFactoryJre.java
index 33106c05,54e8aab3..66a8f5bc
--- a/gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonFactoryJre.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonFactoryJre.java
@@@ -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