Merge pull request #501 from GwtMaterialDesign/release_2.0

Release 2.0-rc3

Author: kevzlou7979

gwt-material/pom.xml

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

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

@@ -46,21 +46,7 @@ public abstract class AbstractValueWidget<V> extends MaterialWidget implements H
 
     private boolean allowBlank = true;
     private BlankValidator<V> blankValidator;
-
-    private AttachEvent.Handler attachHandler = new AttachEvent.Handler() {
-        HandlerRegistration registration;
-
-        @Override
-        public void onAttachOrDetach(AttachEvent event) {
-            if (registration != null) {
-                registration.removeHandler();
-            }
-            AbstractValueWidget inputWidget = getValidatorMixin().getInputWidget();
-            registration = inputWidget.addBlurHandler(blurEvent -> {
-                validate(isValidateOnBlur());
-            });
-        }
-    };
+    private HandlerRegistration blurHandler, attachHandler;
 
     private ValidatorMixin<AbstractValueWidget<V>, V> validatorMixin;
 
@@ -160,6 +146,7 @@ public void reset() {
     @Override
     public void setValidateOnBlur(boolean validateOnBlur) {
         getValidatorMixin().setValidateOnBlur(validateOnBlur);
+        setupBlurValidation();
     }
 
     @Override
@@ -216,12 +203,22 @@ protected BlankValidator<V> createBlankValidator() {
         return new BlankValidator<>();
     }
 
-    protected HandlerRegistration setupBlurValidation() {
-        AbstractValueWidget inputWidget = getValidatorMixin().getInputWidget();
+    protected void setupBlurValidation() {
+        final AbstractValueWidget inputWidget = getValidatorMixin().getInputWidget();
         if (!inputWidget.isAttached()) {
-            return inputWidget.addAttachHandler(attachHandler);
+            if(attachHandler == null) {
+                attachHandler = inputWidget.addAttachHandler(event -> {
+                    if (blurHandler == null) {
+                        blurHandler = inputWidget.addBlurHandler(blurEvent -> {
+                            validate(isValidateOnBlur());
+                        });
+                    }
+                });
+            }
         } else {
-            return inputWidget.addBlurHandler(event -> validate(isValidateOnBlur()));
+            if(blurHandler == null) {
+                blurHandler = inputWidget.addBlurHandler(event -> validate(isValidateOnBlur()));
+            }
         }
     }
 

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

@@ -125,6 +125,15 @@ public Appender(Widget widget) {
     public MaterialWidget() {
     }
 
+    public MaterialWidget(JQueryElement jQueryElement) {
+        setElement(jQueryElement.asElement());
+
+        // We are already attached to the DOM.
+        // This will happen in instances where
+        // we are taking an element from JQuery.
+        onAttach();
+    }
+
     public MaterialWidget(Element element) {
         setElement(element);
     }
@@ -207,6 +216,22 @@ public void insert(final Widget child, final int beforeIndex) {
         insert(child, (Element) getElement(), beforeIndex, true);
     }
 
+    /**
+     * Set the style attribute of your element.
+     * Note that this will override any {@link Element#getStyle()} changes and vice-versa.
+     */
+    public void setStyle(String style) {
+        getElement().setAttribute("style", style);
+    }
+
+    /**
+     * Set the 'class' attribute of this element.
+     * Note that this will override {@link #addStyleName(String)} and vice-versa.
+     */
+    public void setClass(String cssClasses) {
+        getElement().setAttribute("class", cssClasses);
+    }
+
     // Events
 
     @Override

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

@@ -0,0 +1,52 @@
+/*
+ * #%L
+ * GwtMaterial
+ * %%
+ * Copyright (C) 2015 - 2016 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;
+
+import com.google.gwt.dom.client.Element;
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.ui.HasText;
+import gwt.material.design.client.base.mixin.TextMixin;
+
+public class TextWidget extends MaterialWidget implements HasText {
+
+    private final TextMixin<TextWidget> textMixin = new TextMixin<>(this);
+
+    public TextWidget() {
+        super(DOM.createDiv());
+    }
+
+    public TextWidget(Element element) {
+        super(element);
+    }
+
+    public TextWidget(Element element, String... initialClass) {
+        super(element, initialClass);
+    }
+
+    @Override
+    public String getText() {
+        return textMixin.getText();
+    }
+
+    @Override
+    public void setText(String text) {
+        textMixin.setText(text);
+    }
+}

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

@@ -20,10 +20,11 @@
  * #L%
  */
 
+import com.google.gwt.safehtml.shared.SafeHtmlUtils;
 import com.google.gwt.user.client.ui.UIObject;
 
 /**
- * @author Grant Slender
+ * @author Ben Dol
  */
 public class TextMixin<T extends UIObject> extends AbstractMixin<T> {
 

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

@@ -0,0 +1,30 @@
+/*
+ * #%L
+ * GwtMaterial
+ * %%
+ * Copyright (C) 2015 - 2016 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.constants;
+
+/**
+ * Types of Loader.<br>
+ *
+ * @author kevzlou7979
+ */
+public enum LoaderType {
+
+    CIRCULAR, PROGRESS
+}

gwt-material/src/main/java/gwt/material/design/client/js/JsDatePickerOptions.java

@@ -39,12 +39,6 @@ public class JsDatePickerOptions {
     @JsProperty
     public String format;
 
-    @JsProperty
-    public Functions.Func open;
-
-    @JsProperty
-    public Functions.Func close;
-
     @JsProperty
     public Functions.Func1<Thing> set;
 }

gwt-material/src/main/java/gwt/material/design/client/js/JsMaterialElement.java

@@ -193,6 +193,9 @@ public class JsMaterialElement extends JQueryElement {
     @JsMethod
     public native JsMaterialElement off(JsDatePickerOptions options);
 
+    @JsMethod
+    public native JsMaterialElement off(String action);
+
     @JsMethod
     public native JsMaterialElement on(JsDatePickerOptions options);
 
@@ -221,16 +224,16 @@ public class JsMaterialElement extends JQueryElement {
      * Animation Component
      */
     @JsMethod(namespace = JsPackage.GLOBAL)
-    public static native void closeGrid(String selector);
+    public static native void closeGrid(Object selector);
 
     @JsMethod(namespace = JsPackage.GLOBAL)
-    public static native void showGrid(String selector);
+    public static native void showGrid(Object selector);
 
     @JsMethod(namespace = "Materialize")
-    public static native double fadeInImage(String selector);
+    public static native double fadeInImage(Object selector);
 
     @JsMethod(namespace = "Materialize")
-    public static native double showStaggeredList(String selector);
+    public static native double showStaggeredList(Object selector);
 
     @JsMethod(namespace = "Waves")
     public static native void displayEffect();

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

@@ -41,7 +41,7 @@
  * // Adding icon
  * <m:MaterialButton text="Button" waves="LIGHT" backgroundColor="BLUE" iconType="CLOUD" iconPosition="LEFT"/>
  *
- * // FLOATING+ Button
+ * // FLOATING Button
  * <m:MaterialButton type="FLOATING" waves="LIGHT" size="LARGE"  iconType="ADD"/>
  *
  * // FLAT Button
@@ -52,7 +52,7 @@
  * </pre>
  *
  * @author kevzlou7979
- * @see <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/#!buttons">Material Button</a>
+ * @see <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/#buttons">Material Button</a>
  */
 //@formatter:on
 public class MaterialAnchorButton extends AbstractIconButton {

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

@@ -37,7 +37,7 @@
  * </pre>
  *
  * @author kevzlou7979
- * @see <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/#!badges">Material Badge</a>
+ * @see <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/#badges">Material Badge</a>
  */
 //@formatter:on
 public class MaterialBadge extends Span {