Merge pull request #346 from GwtMaterialDesign/release_1.5.1

Release 1.5.1

Author: kevzlou7979

.utility/deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ev
-if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_1.5" ]; then
+if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_1.5.1" ]; then
   echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
   mvn deploy --settings ~/settings.xml
 fi

README.md

@@ -7,29 +7,29 @@
 
 
 ## Demo
-* [1.5.0 Release Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/)
-* [1.5.1 Snapshot Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/snapshot/)
+* [1.5.1 Release Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/)
+* [1.6.0 Snapshot Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/snapshot/)
 
 ## Documentation
 Support documentation can be found [here](https://github.com/GwtMaterialDesign/gwt-material/wiki) <br/>
 We created <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/apidocs" > Java Docs </a> for developers 
 
 
 ## Maven
-### Current Version 1.5.0
+### Current Version 1.5.1
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material</artifactId>
-    <version>1.5.0</version>
+    <version>1.5.1</version>
 </dependency>
 ```
-### Snapshot Version 1.5.1-SNAPSHOT
+### Snapshot Version 1.6.0-SNAPSHOT
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 </dependency>
 ```
 

gwt-material/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>gwt-material-parent</artifactId>
     <groupId>com.github.gwtmaterialdesign</groupId>
-    <version>1.5.0</version>
+    <version>1.5.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

gwt-material/src/main/java/gwt/material/design/client/MaterialDesignBase.java

@@ -21,34 +21,90 @@
  */
 
 import com.google.gwt.core.client.ScriptInjector;
+import com.google.gwt.dom.client.StyleInjector;
 import com.google.gwt.resources.client.TextResource;
 import gwt.material.design.client.resources.MaterialResources;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MaterialDesignBase {
 
-    public void load() {
-        inject(MaterialResources.INSTANCE.materializeJs());
-        inject(MaterialResources.INSTANCE.animationJs());
-        inject(MaterialResources.INSTANCE.shrinkJs());
+    static class FutureResource {
+        TextResource resource;
+        boolean removeTag, sourceUrl;
+
+        public FutureResource(TextResource resource, boolean removeTag, boolean sourceUrl) {
+            this.resource = resource;
+            this.removeTag = removeTag;
+            this.sourceUrl = sourceUrl;
+        }
+    }
+
+    static TextResource jqueryResource;
+    static List<FutureResource> futureResources;
+
+    protected void load() {
+        checkJQuery(false);
+        injectJs(MaterialResources.INSTANCE.materializeJs());
+        injectJs(MaterialResources.INSTANCE.animationJs());
+        injectJs(MaterialResources.INSTANCE.shrinkJs());
+        onModuleLoaded();
     }
 
-    protected void inject(TextResource resource) {
-        inject(resource, true, false);
+    protected void onModuleLoaded() {
+        if(futureResources != null) {
+            for (FutureResource res : futureResources) {
+                injectJs(res.resource, res.removeTag, res.sourceUrl);
+            }
+        }
     }
 
-    protected void injectDebug(TextResource resource) {
-        inject(resource, false, true);
+    public static void injectJs(TextResource resource) {
+        injectJs(resource, true, false);
     }
 
-    protected void inject(TextResource resource, boolean removeTag, boolean sourceUrl) {
+    public static void injectDebugJs(TextResource resource) {
+        injectJs(resource, false, true);
+    }
+
+    public static void injectJs(TextResource resource, boolean removeTag, boolean sourceUrl) {
+        if(!resource.getName().contains("jQuery")) {
+            if(!checkJQuery(sourceUrl)) {
+                // We need to wait for jQuery to load
+                if(futureResources == null) {
+                    futureResources = new ArrayList<>();
+                }
+                futureResources.add(new FutureResource(resource, removeTag, sourceUrl));
+            }
+        }
         String text = resource.getText() +
-            (sourceUrl ? "//# sourceURL="+resource.getName()+".js" : "");
+                (sourceUrl ? "//# sourceURL=" + resource.getName() + ".js" : "");
 
         // Inject the script resource
         ScriptInjector.fromString(text)
-            .setWindow(ScriptInjector.TOP_WINDOW)
-            .setRemoveTag(removeTag)
-            .inject();
+                .setWindow(ScriptInjector.TOP_WINDOW)
+                .setRemoveTag(removeTag)
+                .inject();
+    }
+
+    public static void injectCss(TextResource resource) {
+        StyleInjector.inject(resource.getText());
+    }
+
+    protected static boolean checkJQuery(boolean debug) {
+        if(!isjQueryLoaded()) {
+            if(jqueryResource != null) {
+                if(debug) {
+                    injectDebugJs(jqueryResource);
+                } else {
+                    injectJs(jqueryResource);
+                }
+            } else {
+                return false;
+            }
+        }
+        return true;
     }
 
     /**

gwt-material/src/main/java/gwt/material/design/client/MaterialDesignDebugBase.java

@@ -21,14 +21,15 @@
  */
 
 import gwt.material.design.client.resources.MaterialDebugResources;
-import gwt.material.design.client.resources.MaterialResources;
 
 public class MaterialDesignDebugBase extends MaterialDesignBase {
 
     @Override
     public void load() {
-        injectDebug(MaterialDebugResources.INSTANCE.materializeJsDebug());
-        injectDebug(MaterialDebugResources.INSTANCE.animationJsDebug());
-        injectDebug(MaterialDebugResources.INSTANCE.shrinkJsDebug());
+        checkJQuery(true);
+        injectDebugJs(MaterialDebugResources.INSTANCE.materializeJsDebug());
+        injectDebugJs(MaterialDebugResources.INSTANCE.animationJsDebug());
+        injectDebugJs(MaterialDebugResources.INSTANCE.shrinkJsDebug());
+        onModuleLoaded();
     }
 }

gwt-material/src/main/java/gwt/material/design/client/MaterialWithJQuery.java

@@ -27,14 +27,7 @@ public class MaterialWithJQuery extends MaterialDesignBase implements EntryPoint
 
     @Override
     public void onModuleLoad() {
+        jqueryResource = WithJQueryResources.INSTANCE.jQuery();
         load();
     }
-
-    @Override
-    public void load() {
-        if(!isjQueryLoaded()) {
-            inject(WithJQueryResources.INSTANCE.jQuery());
-        }
-        super.load();
-    }
 }

gwt-material/src/main/java/gwt/material/design/client/MaterialWithJQueryDebug.java

@@ -30,14 +30,7 @@ public class MaterialWithJQueryDebug extends MaterialDesignDebugBase implements
 
     @Override
     public void onModuleLoad() {
+        jqueryResource = WithJQueryDebugResources.INSTANCE.jQueryDebug();
         load();
     }
-
-    @Override
-    public void load() {
-        if(!isjQueryLoaded()) {
-            injectDebug(WithJQueryDebugResources.INSTANCE.jQueryDebug());
-        }
-        super.load();
-    }
 }

gwt-material/src/main/java/gwt/material/design/client/base/AbstractButton.java

@@ -73,6 +73,11 @@ protected AbstractButton() {
         getElement().getStyle().setCursor(Style.Cursor.POINTER);
     }
 
+    protected AbstractButton(String... initialClass) {
+        this();
+        setInitialClasses(initialClass);
+    }
+
     protected AbstractButton(String text, String bgColor, WavesType waves) {
         this(null, text, bgColor);
         setWaves(waves);
@@ -191,42 +196,98 @@ public String getTargetHistoryToken() {
     }
 
     @Override
-    public HandlerRegistration addClickHandler(ClickHandler handler) {
-        return addDomHandler(handler, ClickEvent.getType());
+    public HandlerRegistration addClickHandler(final ClickHandler handler) {
+        return addDomHandler(new ClickHandler() {
+            @Override
+            public void onClick(ClickEvent event) {
+                if(isEnabled()){
+                    handler.onClick(event);
+                }
+            }
+        }, ClickEvent.getType());
     }
 
     @Override
     public HandlerRegistration addMouseDownHandler(final MouseDownHandler handler) {
-        return addDomHandler(handler, MouseDownEvent.getType());
+        return addDomHandler(new MouseDownHandler() {
+            @Override
+            public void onMouseDown(MouseDownEvent event) {
+                if(isEnabled()){
+                    handler.onMouseDown(event);
+                }
+            }
+        }, MouseDownEvent.getType());
     }
 
     @Override
     public HandlerRegistration addMouseMoveHandler(final MouseMoveHandler handler) {
-        return addDomHandler(handler, MouseMoveEvent.getType());
+        return addDomHandler(new MouseMoveHandler() {
+            @Override
+            public void onMouseMove(MouseMoveEvent event) {
+                if(isEnabled()){
+                    handler.onMouseMove(event);
+                }
+            }
+        }, MouseMoveEvent.getType());
     }
 
     @Override
     public HandlerRegistration addMouseOutHandler(final MouseOutHandler handler) {
-        return addDomHandler(handler, MouseOutEvent.getType());
+        return addDomHandler(new MouseOutHandler() {
+            @Override
+            public void onMouseOut(MouseOutEvent event) {
+                if(isEnabled()) {
+                    handler.onMouseOut(event);
+                }
+            }
+        }, MouseOutEvent.getType());
     }
 
     @Override
     public HandlerRegistration addMouseOverHandler(final MouseOverHandler handler) {
-        return addDomHandler(handler, MouseOverEvent.getType());
+        return addDomHandler(new MouseOverHandler() {
+            @Override
+            public void onMouseOver(MouseOverEvent event) {
+                if(isEnabled()) {
+                    handler.onMouseOver(event);
+                }
+            }
+        }, MouseOverEvent.getType());
     }
 
     @Override
     public HandlerRegistration addMouseUpHandler(final MouseUpHandler handler) {
-        return addDomHandler(handler, MouseUpEvent.getType());
+        return addDomHandler(new MouseUpHandler() {
+            @Override
+            public void onMouseUp(MouseUpEvent event) {
+                if(isEnabled()) {
+                    handler.onMouseUp(event);
+                }
+            }
+        }, MouseUpEvent.getType());
     }
 
     @Override
     public HandlerRegistration addMouseWheelHandler(final MouseWheelHandler handler) {
-        return addDomHandler(handler, MouseWheelEvent.getType());
+        return addDomHandler(new MouseWheelHandler() {
+            @Override
+            public void onMouseWheel(MouseWheelEvent event) {
+                if(isEnabled()) {
+                    handler.onMouseWheel(event);
+                }
+            }
+        }, MouseWheelEvent.getType());
     }
 
     @Override
-    public HandlerRegistration addDoubleClickHandler(DoubleClickHandler handler) {
-        return addDomHandler(handler, DoubleClickEvent.getType());
+    public HandlerRegistration addDoubleClickHandler(final DoubleClickHandler handler) {
+        return addDomHandler(new DoubleClickHandler() {
+            @Override
+            public void onDoubleClick(DoubleClickEvent event) {
+                if(isEnabled()) {
+                    handler.onDoubleClick(event);
+                }
+            }
+        }, DoubleClickEvent.getType());
     }
 }

gwt-material/src/main/java/gwt/material/design/client/base/AbstractIconButton.java

@@ -61,6 +61,11 @@ public AbstractIconButton() {
         setIconPosition(IconPosition.LEFT);
     }
 
+    public AbstractIconButton(String... initialClass) {
+        super();
+        setInitialClasses(initialClass);
+    }
+
     @Override
     public MaterialIcon getIcon() {
         return icon;