Merge pull request #743 from GwtMaterialDesign/release_2.0.1

Release 2.0.1

Author: kevzlou7979

.travis.yml

@@ -7,7 +7,7 @@ cache:
   - $HOME/.m2
 before_install:
 # install the gwt-material-jquery because it will depends on built in jquery
-- git clone -b master https://github.com/GwtMaterialDesign/gwt-material-jquery.git
+- git clone -b release_2.0.1 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
 - cd gwt-material-jquery
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..

.utility/deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ev
-if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.0" ]; then
+if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.0.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,7 +7,7 @@
 <br/>
 
 ## Demo
-* [2.0 Release Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/)
+* [2.0.1 Release Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/)
 * [2.1 Snapshot Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/snapshot/)
 
 ## Documentation
@@ -16,12 +16,12 @@ We created <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/apidocs
 
 
 ## Maven
-### Current Version 2.0
+### Current Version 2.0.1
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material</artifactId>
-    <version>2.0</version>
+    <version>2.0.1</version>
 </dependency>
 ```
 ### Snapshot Version 2.1-SNAPSHOT

gwt-material/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.0</version>
+        <version>2.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.github.gwtmaterialdesign</groupId>
             <artifactId>gwt-material-jquery</artifactId>
-            <version>2.0</version>
+            <version>2.0.1</version>
         </dependency>
         <dependency>
             <groupId>com.google.gwt</groupId>

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

@@ -72,7 +72,7 @@ public static void injectDebugJs(TextResource resource) {
     }
 
     public static void injectJs(TextResource resource, boolean removeTag, boolean sourceUrl) {
-        if (!resource.getName().contains("jQuery") && !checkJQuery(sourceUrl)) {
+        if (!resource.getName().equals("jQuery") && !resource.getName().equals("jQueryDebug") && !checkJQuery(sourceUrl)) {
             // We need to wait for jQuery to load
             if (futureResources == null) {
                 futureResources = new ArrayList<>();

gwt-material/src/main/java/gwt/material/design/client/base/helper/DateFormatHelper.java

@@ -0,0 +1,55 @@
+/*
+ * #%L
+ * GwtMaterial
+ * %%
+ * Copyright (C) 2015 - 2018 GwtMaterialDesign
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+package gwt.material.design.client.base.helper;
+
+/**
+ * Basic Date Format helper to support Java Based formats into <a href="http://amsul.ca/pickadate.js/date/#formats">Pickadate.js formats</a>
+ * As of {@link gwt.material.design.client.ui.MaterialDatePicker} 2.0 we just supported the conversion of uppercase
+ * formats to convert it to lower case for the basic support.
+ *
+ * @author [email protected]
+ */
+public class DateFormatHelper {
+
+    static String DEFAULT_FORMAT = "d mmmm, yyyy";
+
+    /**
+     * Will auto format the given string to provide support for pickadate.js formats.
+     */
+    public static String format(String format) {
+
+        if (format == null) {
+            format = DEFAULT_FORMAT;
+        } else {
+            if (format.contains("M")) {
+                format = format.replace("M", "m");
+            }
+
+            if (format.contains("Y")) {
+                format = format.replace("Y", "y");
+            }
+
+            if (format.contains("D")) {
+                format = format.replace("D", "d");
+            }
+        }
+        return format;
+    }
+}

gwt-material/src/main/java/gwt/material/design/client/base/mixin/EnabledMixin.java

@@ -95,6 +95,21 @@ private void applyEnabled(boolean enabled, UIObject obj) {
             obj.addStyleName(CssName.DISABLED);
             obj.getElement().setAttribute(DISABLED, "");
         }
+
+        updateWaves(enabled, obj);
+    }
+
+    public void updateWaves(boolean enabled, UIObject obj) {
+        if (obj instanceof MaterialWidget) {
+            MaterialWidget widget = (MaterialWidget) obj;
+            if (enabled) {
+                if (widget.getWaves() != null) {
+                    widget.getElement().addClassName(CssName.WAVES_EFFECT);
+                }
+            } else {
+                widget.getElement().removeClassName(CssName.WAVES_EFFECT);
+            }
+        }
     }
 
     public boolean isPropagateToChildren() {

gwt-material/src/main/java/gwt/material/design/client/constants/CssName.java

@@ -143,4 +143,5 @@ public interface CssName {
     String DISPLAY_ANIMATION= "display-animation";
     String MATERIALIZE_CSS = "materialcss";
     String PREFIX = "prefix";
+    String LISTBOX_WRAPPER = "listbox-wrapper";
 }

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialDatePicker.java

@@ -31,6 +31,7 @@
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.DOM;
 import gwt.material.design.client.base.*;
+import gwt.material.design.client.base.helper.DateFormatHelper;
 import gwt.material.design.client.base.mixin.ErrorMixin;
 import gwt.material.design.client.base.mixin.ReadOnlyMixin;
 import gwt.material.design.client.constants.*;
@@ -380,21 +381,26 @@ public String getFormat() {
      * To call before initialization.
      */
     public void setFormat(String format) {
-        options.format = format;
+        options.format = DateFormatHelper.format(format);
     }
 
     @Override
     public Date getValue() {
-        return getPickerDate();
+        if (isAttached()) {
+            return getPickerDate();
+        }
+        else {
+            return this.date;
+        }
     }
 
     @Override
     public void setValue(Date value, boolean fireEvents) {
+        this.date = value;
         if (value == null) {
             clear();
             return;
         }
-        this.date = value;
         if (isAttached()) {
             suppressChangeEvent = !fireEvents;
             setPickerDate(JsDate.create((double) value.getTime()), pickatizedDateInput);
@@ -649,6 +655,7 @@ public void stop() {
 
     @Override
     public void clear() {
+        this.date = null;
         dateInput.clear();
         if (getPicker() != null) {
             getPicker().set("select", null);

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialDropDown.java

@@ -115,11 +115,13 @@ protected void registerDropdownItemHandlers() {
         getChildren().forEach(widget -> {
             if (widget instanceof ListItem) {
                 ListItem item = (ListItem) widget;
-                if (item.getWidget(0) instanceof MaterialWidget) {
-                    MaterialWidget child = (MaterialWidget) item.getWidget(0);
-                    registerHandler(child.addDomHandler(event -> {
-                        SelectionEvent.fire(MaterialDropDown.this, child);
-                    }, ClickEvent.getType()));
+                if (item.getWidgetCount() > 0) {
+                    if (item.getWidget(0) instanceof MaterialWidget) {
+                        MaterialWidget child = (MaterialWidget) item.getWidget(0);
+                        registerHandler(child.addDomHandler(event -> {
+                            SelectionEvent.fire(MaterialDropDown.this, child);
+                        }, ClickEvent.getType()));
+                    }
                 }
             }
         });