Merge pull request #376 from GwtMaterialDesign/release_2.2

Release 2.2

Author: kevzlou7979

.travis.yml

@@ -7,12 +7,12 @@ cache:
   - $HOME/.m2
 before_install:
 # install the gwt-material-jquery library before we build the demo
-- git clone -b release_2.1.1 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
+- git clone -b release_2.2 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
 - cd gwt-material-jquery
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..
 # install the gwt-material library before we build the demo
-- git clone -b release_2.1.1 https://github.com/GwtMaterialDesign/gwt-material.git
+- git clone -b release_2.2 https://github.com/GwtMaterialDesign/gwt-material.git
 - cd gwt-material
 - 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.1.1" ]; then
+if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.2" ]; 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
+  mvn deploy -DskipTests --settings ~/settings.xml
 fi

README.md

@@ -6,12 +6,12 @@
 
 Gwt Material Design Extra Components for https://github.com/GwtMaterialDesign/gwt-material <br>
 
-## Current Version 2.1.1
+## Current Version 2.2-rc1
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-addins</artifactId>
-    <version>2.1.1</version>
+    <version>2.2-rc1</version>
 </dependency>
 ```
 

pom.xml

@@ -5,25 +5,25 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.1.1</version>
+        <version>2.2-rc1</version>
     </parent>
 
     <artifactId>gwt-material-addins</artifactId>
     <packaging>gwt-lib</packaging>
 
     <name>Gwt Material Addins</name>
-    <version>2.1.1</version>
+    <version>2.2-rc1</version>
     <description>Extra Components of GWT Material Framework</description>
 
     <properties>
-        <gwt-material.version>2.1.1</gwt-material.version>
+        <gwt-material.version>2.2-rc1</gwt-material.version>
     </properties>
 
     <scm>
         <connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-addins.git</connection>
         <developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-addins.git</developerConnection>
         <url>http://github.com/GwtMaterialDesign/gwt-material-addins</url>
-        <tag>v2.1.1</tag>
+        <tag>v2.2-rc1</tag>
     </scm>
 
     <licenses>

src/main/java/gwt/material/design/addins/client/base/constants/AddinsCssName.java

@@ -75,6 +75,7 @@ public interface AddinsCssName {
     String SUCCESS = "success";
     String ERROR = "error";
     String STEPPER = "stepper";
+    String STEP_HEADER = "step-header";
     String FEEDBACK = "feedback";
     String SUBHEADER = "subheader";
     String CONTAINER1 = "container1";
@@ -122,4 +123,5 @@ public interface AddinsCssName {
     String WIDE = "wide";
     String BRIDGE_PATH = "bridge-path";
     String INTERACT_IGNORED_CONTENT = "interact-ignored-content";
+    String FIXED_STEP_WIDTH = "fixed-step-width";
 }

src/main/java/gwt/material/design/addins/client/camera/MaterialCameraCapture.java

@@ -242,14 +242,23 @@ protected void nativePlay(Element video) {
 
             Navigator.mediaDevices.getUserMedia(constraints).then(streamObj -> {
                 mediaStream = (MediaStream) streamObj;
-                if (URL.createObjectURL(mediaStream) != null) {
-                    $(video).attr("src", URL.createObjectURL(mediaStream));
-                } else if (WebkitURL.createObjectURL(mediaStream) != null) {
-                    $(video).attr("src", WebkitURL.createObjectURL(mediaStream));
-                }
-                if (video instanceof VideoElement) {
-                    ((VideoElement) video).play();
+
+                if (mediaStream != null) {
+                    try {
+                        video.setPropertyObject("srcObject", mediaStream);
+                    } catch (Exception e) {
+                        if (URL.createObjectURL(mediaStream) != null) {
+                            $(video).attr("src", URL.createObjectURL(mediaStream));
+                        } else if (WebkitURL.createObjectURL(mediaStream) != null) {
+                            $(video).attr("src", WebkitURL.createObjectURL(mediaStream));
+                        }
+                    } finally {
+                        if (video instanceof VideoElement) {
+                            ((VideoElement) video).play();
+                        }
+                    }
                 }
+
                 onCameraCaptureLoad();
                 return null;
             }).catchException(error -> {

src/main/java/gwt/material/design/addins/client/carousel/MaterialCarousel.java

@@ -20,7 +20,6 @@
 package gwt.material.design.addins.client.carousel;
 
 import com.google.gwt.core.client.GWT;
-import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.event.logical.shared.ValueChangeEvent;
 import com.google.gwt.event.logical.shared.ValueChangeHandler;
@@ -42,7 +41,10 @@
 import gwt.material.design.client.base.mixin.CssTypeMixin;
 import gwt.material.design.client.base.mixin.ToggleStyleMixin;
 import gwt.material.design.client.constants.CssName;
-import gwt.material.design.client.ui.*;
+import gwt.material.design.client.ui.MaterialButton;
+import gwt.material.design.client.ui.MaterialImage;
+import gwt.material.design.client.ui.MaterialPanel;
+import gwt.material.design.client.ui.MaterialTab;
 
 import java.util.List;
 
@@ -271,7 +273,7 @@ public void play() {
     }
 
     protected Object command(String action, Object... params) {
-        if (container == null || !container.isAttached()) {
+        if (container == null) {
             GWT.log("Your carousel container is not yet initialized", new IllegalStateException());
         } else {
             return $("#" + container.getId()).slick(action, params);