Merge pull request #520 from GwtMaterialDesign/release_2.0

Release 2.0-rc4

Author: kevzlou7979

README.md

@@ -37,7 +37,7 @@ You can find lists of features by version <a href="https://github.com/GwtMateria
 
 ### Migration
 [Migrating from 1.3 to 1.4](https://github.com/GwtMaterialDesign/gwt-material/wiki/Migrating-from-1.3-to-1.4) <br/>
-[Migrating from 1.x to 2.0](https://github.com/GwtMaterialDesign/gwt-material/wiki/2.0---API-Changes)
+[Migrating from 1.x to 2.0](https://github.com/GwtMaterialDesign/gwt-material/wiki/2.0-API-Changes)
 
 ## License
 [Apache 2.0 License](https://github.com/GwtMaterialDesign/gwt-material/blob/master/LICENSE)

gwt-material/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.0-rc3</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-rc3</version>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.google.gwt</groupId>

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

@@ -47,9 +47,11 @@ public FutureResource(TextResource resource, boolean removeTag, boolean sourceUr
 
     protected void load() {
         checkJQuery(false);
-        injectJs(MaterialResources.INSTANCE.materializeJs());
-        injectJs(MaterialResources.INSTANCE.animationJs());
-        injectJs(MaterialResources.INSTANCE.shrinkJs());
+        if(!isMaterializeLoaded()) {
+            injectJs(MaterialResources.INSTANCE.materializeJs());
+            injectJs(MaterialResources.INSTANCE.animationJs());
+            injectJs(MaterialResources.INSTANCE.shrinkJs());
+        }
         onModuleLoaded();
     }
 
@@ -70,23 +72,22 @@ public static void injectDebugJs(TextResource resource) {
     }
 
     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));
+        if (!resource.getName().contains("jQuery") && !checkJQuery(sourceUrl)) {
+            // We need to wait for jQuery to load
+            if (futureResources == null) {
+                futureResources = new ArrayList<>();
             }
-        }
-        String text = resource.getText() + (sourceUrl ?
+            futureResources.add(new FutureResource(resource, removeTag, sourceUrl));
+        } else {
+            String text = resource.getText() + (sourceUrl ?
                 "//# sourceURL=" + resource.getName() + ".js" : "");
 
-        // Inject the script resource
-        ScriptInjector.fromString(text)
+            // Inject the script resource
+            ScriptInjector.fromString(text)
                 .setWindow(ScriptInjector.TOP_WINDOW)
                 .setRemoveTag(removeTag)
                 .inject();
+        }
     }
 
     public static void injectCss(TextResource resource) {
@@ -101,7 +102,7 @@ protected static boolean checkJQuery(boolean debug) {
                 injectJs(jQueryProvider.jQuery());
             }
         }
-        return true;
+        return isjQueryLoaded();
     }
 
     public static boolean isProvidingJQuery() {

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

@@ -27,9 +27,11 @@ public class MaterialDesignDebugBase extends MaterialDesignBase {
     @Override
     public void load() {
         checkJQuery(true);
-        injectDebugJs(MaterialDebugResources.INSTANCE.materializeJsDebug());
-        injectDebugJs(MaterialDebugResources.INSTANCE.animationJsDebug());
-        injectDebugJs(MaterialDebugResources.INSTANCE.shrinkJsDebug());
+        if(!isMaterializeLoaded()) {
+            injectDebugJs(MaterialDebugResources.INSTANCE.materializeJsDebug());
+            injectDebugJs(MaterialDebugResources.INSTANCE.animationJsDebug());
+            injectDebugJs(MaterialDebugResources.INSTANCE.shrinkJsDebug());
+        }
         onModuleLoaded();
     }
 }

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

@@ -63,7 +63,7 @@ public AbstractValueWidget(Element element, String... initialClass) {
 
     @Override
     public void setValue(V value) {
-        setValue(value, true);
+        setValue(value, false);
     }
 
     @Override

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

@@ -1036,6 +1036,10 @@ public void setBottom(double value) {
         getElement().getStyle().setBottom(value, Style.Unit.PX);
     }
 
+    public void setLineHeight(double value) {
+        getElement().getStyle().setLineHeight(value, Style.Unit.PX);
+    }
+
     @Override
     public void setHoverable(boolean hoverable) {
         getHoverableMixin().setOn(hoverable);

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

@@ -20,26 +20,42 @@
 package gwt.material.design.client.base.mixin;
 
 import com.google.gwt.user.client.ui.UIObject;
+import com.google.gwt.user.client.ui.Widget;
 import gwt.material.design.client.base.HasActive;
+import gwt.material.design.client.base.MaterialWidget;
 import gwt.material.design.client.constants.CssName;
 
 public class ActiveMixin<T extends UIObject & HasActive> extends AbstractMixin<T> implements HasActive {
 
+    private boolean active;
+    private MaterialWidget target;
+
     public ActiveMixin(final T widget) {
         super(widget);
     }
 
-    private boolean active;
+    public ActiveMixin(final T widget, final MaterialWidget target) {
+        super(widget);
+        this.target = target;
+    }
 
     @Override
     public void setActive(boolean active) {
         this.active = active;
+        if (target != null) {
+            applyActiveStyle(target, active);
+        } else {
+            applyActiveStyle((Widget) uiObject, active);
+        }
+    }
+
+    protected void applyActiveStyle(Widget widget, boolean active) {
         if (active) {
-            uiObject.removeStyleName(CssName.INACTIVE);
-            uiObject.addStyleName(CssName.ACTIVE);
+            widget.removeStyleName(CssName.INACTIVE);
+            widget.addStyleName(CssName.ACTIVE);
         } else {
-            uiObject.removeStyleName(CssName.ACTIVE);
-            uiObject.addStyleName(CssName.INACTIVE);
+            widget.removeStyleName(CssName.ACTIVE);
+            widget.addStyleName(CssName.INACTIVE);
         }
     }
 

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

@@ -0,0 +1,25 @@
+/*
+ * #%L
+ * GwtMaterial
+ * %%
+ * Copyright (C) 2015 - 2017 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;
+
+public enum DatePickerContainer {
+
+    BODY, SELF
+}

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

@@ -31,7 +31,7 @@ public class JsDatePickerOptions {
     public String container;
 
     @JsProperty
-    public boolean selectYears;
+    public int selectYears;
 
     @JsProperty
     public boolean selectMonths;
@@ -41,4 +41,4 @@ public class JsDatePickerOptions {
 
     @JsProperty
     public Functions.Func1<Thing> set;
-}
+}

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

@@ -54,6 +54,6 @@ public MaterialColumn() {
 
     public MaterialColumn(int small, int medium, int large) {
         this();
-        addStyleName("s" + small + " m" + medium + " l" + large);
+        setGrid("s" + small + " m" + medium + " l" + large);
     }
 }