Skip to content

Commit a12ce54

Browse files
authored
Merge pull request #987 from GwtMaterialDesign/release_2.4.1
Release 2.4.1
2 parents 4c7b3d3 + 9d956fa commit a12ce54

File tree

10 files changed

+174
-36
lines changed

10 files changed

+174
-36
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cache:
88
- $HOME/.m2
99
before_install:
1010
# install the gwt-material-jquery because it will depends on built in jquery
11-
- git clone -b release_2.4.0 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
11+
- git clone -b release_2.4.1 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
1212
- cd gwt-material-jquery
1313
- mvn install -DskipTests=true -DdryRun=true
1414
- cd ..

.utility/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
set -ev
3-
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.4.0" ]; then
3+
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.4.1" ]; then
44
echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
55
mvn deploy -DskipTests --settings ~/settings.xml
66
fi

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ We created <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/apidocs
2020

2121

2222
## Maven
23-
### Current Version 2.4.0
23+
### Current Version 2.4.1
2424
```xml
2525
<dependency>
2626
<groupId>com.github.gwtmaterialdesign</groupId>
2727
<artifactId>gwt-material</artifactId>
28-
<version>2.4.0</version>
28+
<version>2.4.1</version>
2929
</dependency>
3030
```
3131
### Snapshot Version 2.5.0-SNAPSHOT

gwt-material/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>gwt-material-parent</artifactId>
66
<groupId>com.github.gwtmaterialdesign</groupId>
7-
<version>2.4.0</version>
7+
<version>2.4.1</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

gwt-material/src/main/java/gwt/material/design/client/pwa/serviceworker/ServiceWorkerManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void reload() {
105105
*/
106106
protected void setupRegistration() {
107107
if (isServiceWorkerSupported()) {
108-
Navigator.serviceWorker.register(getResource(), getOption()).then((e, object) -> {
108+
Navigator.serviceWorker.register(getResource(), getOption()).then((object) -> {
109109
logger.info("Service worker has been successfully registered");
110110
registration = (ServiceWorkerRegistration) object;
111111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -958,7 +958,7 @@ public void setKeyFactory(KeyFactory<T, String> keyFactory) {
958958
@Override
959959
public void setReadOnly(boolean value) {
960960
getReadOnlyMixin().setReadOnly(value);
961-
if (!value) {
961+
if (!value && isAttached()) {
962962
$(listBox.getElement()).material_select("destroy");
963963
$(listBox.getElement()).material_select();
964964
}

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public void onKeyUp(KeyUpEvent event) {
182182
reset(obj.getKeyword());
183183
});
184184
// If matches add to search result container and object to temp searches
185-
if (obj.getKeyword().toLowerCase().contains(keyword)) {
185+
if (match(obj, keyword)) {
186186
searchResultPanel.add(link);
187187
tempSearches.add(obj);
188188
}
@@ -212,25 +212,21 @@ public void onKeyUp(KeyUpEvent event) {
212212

213213
// Selection logic using key down event to navigate the search results
214214
int totalItems = searchResultPanel.getWidgetCount();
215-
if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_DOWN) {
216-
if (curSel >= totalItems) {
217-
setCurSel(getCurSel());
218-
applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel - 1));
219-
} else {
220-
setCurSel(getCurSel() + 1);
221-
applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel));
215+
if (totalItems > 0) {
216+
if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_DOWN) {
217+
if (++curSel >= totalItems)
218+
curSel = 0;
219+
220+
applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel));
222221
}
223-
}
224222

225-
// Selection logic using key up event to navigate the search results
226-
if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_UP) {
227-
if (curSel <= -1) {
228-
setCurSel(-1);
229-
applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel));
230-
} else {
231-
setCurSel(getCurSel() - 1);
232-
applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel));
233-
}
223+
// Selection logic using key up event to navigate the search results
224+
if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_UP) {
225+
if (--curSel < 0)
226+
curSel = totalItems - 1;
227+
228+
applyHighlightedItem((MaterialLink) searchResultPanel.getWidget(curSel));
229+
}
234230
}
235231
}
236232

@@ -245,6 +241,10 @@ private void reset(String keyword) {
245241
}));
246242
}
247243

244+
protected boolean match(SearchObject obj, String keyword) {
245+
return obj.getKeyword().toLowerCase().contains(keyword);
246+
}
247+
248248
@Override
249249
protected void onUnload() {
250250
super.onUnload();

gwt-material/src/main/resources/gwt/material/design/public/css/animation.css

Lines changed: 146 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3452,6 +3452,36 @@
34523452
animation-name: sharedAxisXForwardIn;
34533453
}
34543454

3455+
/** Shared Axis X ForwardOut **/
3456+
@-webkit-keyframes sharedAxisXForwardOut {
3457+
from {
3458+
opacity: 1;
3459+
transform: translateX(0px);
3460+
}
3461+
3462+
to {
3463+
opacity: 0;
3464+
transform: translateX(-30px);
3465+
}
3466+
}
3467+
3468+
@keyframes sharedAxisXForwardOut {
3469+
from {
3470+
opacity: 1;
3471+
transform: translateX(0px);
3472+
}
3473+
3474+
to {
3475+
opacity: 0;
3476+
transform: translateX(-30px);
3477+
}
3478+
}
3479+
3480+
.sharedAxisXForwardOut {
3481+
-webkit-animation-name: sharedAxisXForwardOut;
3482+
animation-name: sharedAxisXForwardOut;
3483+
}
3484+
34553485
/** Shared Axis X BackwardIn **/
34563486
@-webkit-keyframes sharedAxisXBackwardIn {
34573487
from {
@@ -3482,34 +3512,34 @@
34823512
animation-name: sharedAxisXBackwardIn;
34833513
}
34843514

3485-
/** Shared Axis X ForwardOut **/
3486-
@-webkit-keyframes sharedAxisXForwardOut {
3515+
/** Shared Axis X BackwardIn **/
3516+
@-webkit-keyframes sharedAxisXBackwardOut {
34873517
from {
34883518
opacity: 1;
34893519
transform: translateX(0px);
34903520
}
34913521

34923522
to {
34933523
opacity: 0;
3494-
transform: translateX(-30px);
3524+
transform: translateX(30px);
34953525
}
34963526
}
34973527

3498-
@keyframes sharedAxisXForwardOut {
3528+
@keyframes sharedAxisXBackwardOut {
34993529
from {
35003530
opacity: 1;
35013531
transform: translateX(0px);
35023532
}
35033533

35043534
to {
35053535
opacity: 0;
3506-
transform: translateX(-30px);
3536+
transform: translateX(30px);
35073537
}
35083538
}
35093539

3510-
.sharedAxisXForwardOut {
3511-
-webkit-animation-name: sharedAxisXForwardOut;
3512-
animation-name: sharedAxisXForwardOut;
3540+
.sharedAxisXBackwardOut {
3541+
-webkit-animation-name: sharedAxisXBackwardOut;
3542+
animation-name: sharedAxisXBackwardOut;
35133543
}
35143544

35153545
/** Shared Axis Y ForwardIn **/
@@ -3572,6 +3602,66 @@
35723602
animation-name: sharedAxisYForwardOut;
35733603
}
35743604

3605+
/** Shared Axis Y BackwardIn **/
3606+
@-webkit-keyframes sharedAxisYBackwardIn {
3607+
from {
3608+
opacity: 0;
3609+
transform: translateY(-30px);
3610+
}
3611+
3612+
to {
3613+
opacity: 1;
3614+
transform: translateY(0px);
3615+
}
3616+
}
3617+
3618+
@keyframes sharedAxisYBackwardIn {
3619+
from {
3620+
opacity: 0;
3621+
transform: translateY(-30px);
3622+
}
3623+
3624+
to {
3625+
opacity: 1;
3626+
transform: translateY(0px);
3627+
}
3628+
}
3629+
3630+
.sharedAxisYBackwardIn {
3631+
-webkit-animation-name: sharedAxisYBackwardIn;
3632+
animation-name: sharedAxisYBackwardIn;
3633+
}
3634+
3635+
/** Shared Axis Y BackwardOut **/
3636+
@-webkit-keyframes sharedAxisYBackwardOut {
3637+
from {
3638+
opacity: 1;
3639+
transform: translateY(0px);
3640+
}
3641+
3642+
to {
3643+
opacity: 0;
3644+
transform: translateY(30px);
3645+
}
3646+
}
3647+
3648+
@keyframes sharedAxisYBackwardOut {
3649+
from {
3650+
opacity: 1;
3651+
transform: translateY(0px);
3652+
}
3653+
3654+
to {
3655+
opacity: 0;
3656+
transform: translateY(30px);
3657+
}
3658+
}
3659+
3660+
.sharedAxisYBackwardOut {
3661+
-webkit-animation-name: sharedAxisYBackwardOut;
3662+
animation-name: sharedAxisYBackwardOut;
3663+
}
3664+
35753665
/** Shared Axis Z In **/
35763666
@-webkit-keyframes sharedAxisZIn {
35773667
from {
@@ -3645,4 +3735,52 @@
36453735
transition-delay: 0s !important;
36463736
will-change: none !important;
36473737
}
3738+
}
3739+
3740+
@-webkit-keyframes breathing {
3741+
0% {
3742+
-webkit-transform: scale(0.9);
3743+
transform: scale(0.9);
3744+
}
3745+
3746+
25% {
3747+
-webkit-transform: scale(1);
3748+
transform: scale(1);
3749+
}
3750+
3751+
60% {
3752+
-webkit-transform: scale(0.9);
3753+
transform: scale(0.9);
3754+
}
3755+
3756+
100% {
3757+
-webkit-transform: scale(0.9);
3758+
transform: scale(0.9);
3759+
}
3760+
}
3761+
3762+
@keyframes breathing {
3763+
0% {
3764+
-webkit-transform: scale(0.9);
3765+
-ms-transform: scale(0.9);
3766+
transform: scale(0.9);
3767+
}
3768+
3769+
25% {
3770+
-webkit-transform: scale(1);
3771+
-ms-transform: scale(1);
3772+
transform: scale(1);
3773+
}
3774+
3775+
60% {
3776+
-webkit-transform: scale(0.9);
3777+
-ms-transform: scale(0.9);
3778+
transform: scale(0.9);
3779+
}
3780+
3781+
100% {
3782+
-webkit-transform: scale(0.9);
3783+
-ms-transform: scale(0.9);
3784+
transform: scale(0.9);
3785+
}
36483786
}

gwt-material/src/main/resources/gwt/material/design/public/css/animation.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.github.gwtmaterialdesign</groupId>
77
<artifactId>gwt-material-parent</artifactId>
8-
<version>2.4.0</version>
8+
<version>2.4.1</version>
99
<packaging>pom</packaging>
1010
<modules>
1111
<module>gwt-material</module>
@@ -69,7 +69,7 @@
6969
<connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material.git</connection>
7070
<developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material.git</developerConnection>
7171
<url>http://github.com/GwtMaterialDesign/gwt-material</url>
72-
<tag>v2.4.0</tag>
72+
<tag>v2.4.1</tag>
7373
</scm>
7474

7575
<licenses>

0 commit comments

Comments
 (0)