Skip to content

Commit 0f813d9

Browse files
authored
Merge branch 'master' into release_2.5.0
2 parents b1820bc + db9e131 commit 0f813d9

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
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.5.0 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
11+
- git clone -b release_2.5.0_rc1 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.5.0" ]; then
3+
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.5.0_rc1" ]; 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.5.0
23+
### Current Version 2.5.0-rc1
2424
```xml
2525
<dependency>
2626
<groupId>com.github.gwtmaterialdesign</groupId>
2727
<artifactId>gwt-material</artifactId>
28-
<version>2.5.0</version>
28+
<version>2.5.0-rc1</version>
2929
</dependency>
3030
```
3131
### Snapshot Version 2.5.0

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,11 @@ public void setWidget(final Widget widget) {
206206
}
207207

208208
if (this.widget.isAttached()) {
209+
widget.addAttachHandler(event -> {
210+
if (!event.isAttached()) {
211+
unload();
212+
}
213+
});
209214
reload();
210215
} else {
211216
// Smart detect the attachment and detachment of widget to update the tooltip

gwt-material/src/test/java/gwt/material/design/client/mixin/TextMixinTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ protected void runTest(TextMixin<MaterialLabel> mixin) {
5454
mixin.setText("<script>alert('xss')</script>");
5555
assertEquals("<script>alert('xss')</script>", mixin.getText());
5656

57+
5758
// Test setText(SafeHtml)
5859
String anchorTag = "<a>test</a>";
5960
SafeHtmlBuilder builder = new SafeHtmlBuilder();

0 commit comments

Comments
 (0)