Merge pull request #987 from GwtMaterialDesign/release_2.4.1

Release 2.4.1
GwtMaterialDesign · Sep 26, 2020 · a12ce54 · a12ce54
2 parents 4c7b3d3 + 9d956fa
commit a12ce54
Show file tree

Hide file tree

Showing 10 changed files with 174 additions and 36 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ cache:
   - $HOME/.m2
 before_install:
 # install the gwt-material-jquery because it will depends on built in jquery
-- git clone -b release_2.4.0 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
+- git clone -b release_2.4.1 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
 - cd gwt-material-jquery
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..

diff --git a/.utility/deploy.sh b/.utility/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ev
-if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.4.0" ]; then
+if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.4.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 -DskipTests --settings ~/settings.xml
 fi
diff --git a/README.md b/README.md
@@ -20,12 +20,12 @@ We created <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/apidocs
 
 
 ## Maven
-### Current Version 2.4.0
+### Current Version 2.4.1
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material</artifactId>
-    <version>2.4.0</version>
+    <version>2.4.1</version>
 </dependency>
 ```
 ### Snapshot Version 2.5.0-SNAPSHOT

diff --git a/gwt-material/pom.xml b/gwt-material/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.4.0</version>
+        <version>2.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...rial/src/main/java/gwt/material/design/client/pwa/serviceworker/ServiceWorkerManager.java b/...rial/src/main/java/gwt/material/design/client/pwa/serviceworker/ServiceWorkerManager.java
@@ -105,7 +105,7 @@ public void reload() {
      */
     protected void setupRegistration() {
         if (isServiceWorkerSupported()) {
-            Navigator.serviceWorker.register(getResource(), getOption()).then((e, object) -> {
+            Navigator.serviceWorker.register(getResource(), getOption()).then((object) -> {
                 logger.info("Service worker has been successfully registered");
                 registration = (ServiceWorkerRegistration) object;
 

diff --git a/gwt-material/src/main/java/gwt/material/design/client/ui/MaterialListValueBox.java b/gwt-material/src/main/java/gwt/material/design/client/ui/MaterialListValueBox.java
@@ -958,7 +958,7 @@ public void setKeyFactory(KeyFactory<T, String> keyFactory) {
     @Override
     public void setReadOnly(boolean value) {
         getReadOnlyMixin().setReadOnly(value);
-        if (!value) {
+        if (!value && isAttached()) {
             $(listBox.getElement()).material_select("destroy");
             $(listBox.getElement()).material_select();
         }

diff --git a/gwt-material/src/main/java/gwt/material/design/client/ui/MaterialSearch.java b/gwt-material/src/main/java/gwt/material/design/client/ui/MaterialSearch.java
@@ -182,7 +182,7 @@ public void onKeyUp(KeyUpEvent event) {
                         reset(obj.getKeyword());
                     });
                     // If matches add to search result container and object to temp searches
-                    if (obj.getKeyword().toLowerCase().contains(keyword)) {
+                    if (match(obj, keyword)) {
                         searchResultPanel.add(link);
                         tempSearches.add(obj);
                     }
@@ -212,25 +212,21 @@ public void onKeyUp(KeyUpEvent event) {
 
                 // Selection logic using key down event to navigate the search results
                 int totalItems = searchResultPanel.getWidgetCount();
-                if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_DOWN) {
-                    if (curSel >= totalItems) {
-                        setCurSel(getCurSel());
-                        applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel - 1));
-                    } else {
-                        setCurSel(getCurSel() + 1);
-                        applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel));
+                if (totalItems > 0) {
+                    if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_DOWN) {
+                    	if (++curSel >= totalItems)
+                    		curSel = 0;
+
+                    	applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel));
                     }
-                }
 
-                // Selection logic using key up event to navigate the search results
-                if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_UP) {
-                    if (curSel <= -1) {
-                        setCurSel(-1);
-                        applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel));
-                    } else {
-                        setCurSel(getCurSel() - 1);
-                        applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel));
-                    }
+                    // Selection logic using key up event to navigate the search results
+                    if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_UP) {
+                    	if (--curSel < 0)
+                    		curSel = totalItems - 1;
+
+                    	applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel));
+                    }                	
                 }
             }
 
@@ -245,6 +241,10 @@ private void reset(String keyword) {
         }));
     }
 
+	protected boolean match(SearchObject obj, String keyword) {
+		return obj.getKeyword().toLowerCase().contains(keyword);
+	}
+
     @Override
     protected void onUnload() {
         super.onUnload();

diff --git a/gwt-material/src/main/resources/gwt/material/design/public/css/animation.css b/gwt-material/src/main/resources/gwt/material/design/public/css/animation.css
@@ -3452,6 +3452,36 @@
   animation-name: sharedAxisXForwardIn;
 }
 
+/** Shared Axis X ForwardOut **/
+@-webkit-keyframes sharedAxisXForwardOut {
+  from {
+    opacity: 1;
+    transform: translateX(0px);
+  }
+
+  to {
+    opacity: 0;
+    transform: translateX(-30px);
+  }
+}
+
+@keyframes sharedAxisXForwardOut {
+  from {
+    opacity: 1;
+    transform: translateX(0px);
+  }
+
+  to {
+    opacity: 0;
+    transform: translateX(-30px);
+  }
+}
+
+.sharedAxisXForwardOut {
+  -webkit-animation-name: sharedAxisXForwardOut;
+  animation-name: sharedAxisXForwardOut;
+}
+
 /** Shared Axis X BackwardIn **/
 @-webkit-keyframes sharedAxisXBackwardIn {
   from {
@@ -3482,34 +3512,34 @@
   animation-name: sharedAxisXBackwardIn;
 }
 
-/** Shared Axis X ForwardOut **/
-@-webkit-keyframes sharedAxisXForwardOut {
+/** Shared Axis X BackwardIn **/
+@-webkit-keyframes sharedAxisXBackwardOut {
   from {
     opacity: 1;
     transform: translateX(0px);
   }
 
   to {
     opacity: 0;
-    transform: translateX(-30px);
+    transform: translateX(30px);
   }
 }
 
-@keyframes sharedAxisXForwardOut {
+@keyframes sharedAxisXBackwardOut {
   from {
     opacity: 1;
     transform: translateX(0px);
   }
 
   to {
     opacity: 0;
-    transform: translateX(-30px);
+    transform: translateX(30px);
   }
 }
 
-.sharedAxisXForwardOut {
-  -webkit-animation-name: sharedAxisXForwardOut;
-  animation-name: sharedAxisXForwardOut;
+.sharedAxisXBackwardOut {
+  -webkit-animation-name: sharedAxisXBackwardOut;
+  animation-name: sharedAxisXBackwardOut;
 }
 
 /** Shared Axis Y ForwardIn **/
@@ -3572,6 +3602,66 @@
   animation-name: sharedAxisYForwardOut;
 }
 
+/** Shared Axis Y BackwardIn **/
+@-webkit-keyframes sharedAxisYBackwardIn {
+  from {
+    opacity: 0;
+    transform: translateY(-30px);
+  }
+
+  to {
+    opacity: 1;
+    transform: translateY(0px);
+  }
+}
+
+@keyframes sharedAxisYBackwardIn {
+  from {
+    opacity: 0;
+    transform: translateY(-30px);
+  }
+
+  to {
+    opacity: 1;
+    transform: translateY(0px);
+  }
+}
+
+.sharedAxisYBackwardIn {
+  -webkit-animation-name: sharedAxisYBackwardIn;
+  animation-name: sharedAxisYBackwardIn;
+}
+
+/** Shared Axis Y BackwardOut **/
+@-webkit-keyframes sharedAxisYBackwardOut {
+  from {
+    opacity: 1;
+    transform: translateY(0px);
+  }
+
+  to {
+    opacity: 0;
+    transform: translateY(30px);
+  }
+}
+
+@keyframes sharedAxisYBackwardOut {
+  from {
+    opacity: 1;
+    transform: translateY(0px);
+  }
+
+  to {
+    opacity: 0;
+    transform: translateY(30px);
+  }
+}
+
+.sharedAxisYBackwardOut {
+  -webkit-animation-name: sharedAxisYBackwardOut;
+  animation-name: sharedAxisYBackwardOut;
+}
+
 /** Shared Axis Z In **/
 @-webkit-keyframes sharedAxisZIn {
   from {
@@ -3645,4 +3735,52 @@
     transition-delay: 0s !important;
     will-change: none !important;
   }
+}
+
+@-webkit-keyframes breathing {
+  0% {
+    -webkit-transform: scale(0.9);
+    transform: scale(0.9);
+  }
+
+  25% {
+    -webkit-transform: scale(1);
+    transform: scale(1);
+  }
+
+  60% {
+    -webkit-transform: scale(0.9);
+    transform: scale(0.9);
+  }
+
+  100% {
+    -webkit-transform: scale(0.9);
+    transform: scale(0.9);
+  }
+}
+
+@keyframes breathing {
+  0% {
+    -webkit-transform: scale(0.9);
+    -ms-transform: scale(0.9);
+    transform: scale(0.9);
+  }
+
+  25% {
+    -webkit-transform: scale(1);
+    -ms-transform: scale(1);
+    transform: scale(1);
+  }
+
+  60% {
+    -webkit-transform: scale(0.9);
+    -ms-transform: scale(0.9);
+    transform: scale(0.9);
+  }
+
+  100% {
+    -webkit-transform: scale(0.9);
+    -ms-transform: scale(0.9);
+    transform: scale(0.9);
+  }
 }
diff --git a/gwt-material/src/main/resources/gwt/material/design/public/css/animation.min.css b/gwt-material/src/main/resources/gwt/material/design/public/css/animation.min.css
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-parent</artifactId>
-    <version>2.4.0</version>
+    <version>2.4.1</version>
     <packaging>pom</packaging>
     <modules>
         <module>gwt-material</module>
@@ -69,7 +69,7 @@
         <connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material.git</connection>
         <developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material.git</developerConnection>
         <url>http://github.com/GwtMaterialDesign/gwt-material</url>
-        <tag>v2.4.0</tag>
+        <tag>v2.4.1</tag>
     </scm>
 
     <licenses>