Skip to content

Commit 77f3c25

Browse files
kevzlou7979kevzlou7979
authored
Merge pull request #48 from GwtMaterialDesign/release_2.0
Release 2.0-rc3
2 parents ead4bfc + b2a8942 commit 77f3c25

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+341
-229
lines changed

‎.utility/update_demo_site.sh‎

Lines changed: 12 additions & 12 deletions
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" == "master" ]; then
3+
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.0" ]; then
44

55
if [[ -z "$GH_TOKEN" ]]; then
66
echo -e "GH_TOKEN is not set"
@@ -24,23 +24,23 @@ git clone --quiet --branch=gh-pages https://[email protected]/GwtMaterialDesi
2424
cd gh-pages
2525

2626
# remove the GwtMaterialDemo directories from git.
27-
if [[ -d ./gwtmaterialdemo ]]; then
28-
git rm -rf ./gwtmaterialdemo
27+
if [[ -d ./snapshot/gwtmaterialdemo ]]; then
28+
git rm -rf ./snapshot/gwtmaterialdemo
2929
fi
30-
if [[ -f ./index.html ]]; then
31-
git rm -rf ./index.html
30+
if [[ -f ./snapshot/index.html ]]; then
31+
git rm -rf ./snapshot/index.html
3232
fi
33-
if [[ -d ./META-INF ]]; then
34-
git rm -rf ./META-INF
33+
if [[ -d ./snapshot/META-INF ]]; then
34+
git rm -rf ./snapshot/META-INF
3535
fi
36-
if [[ -d ./WEB-INF ]]; then
37-
git rm -rf ./WEB-INF
36+
if [[ -d ./snapshot/WEB-INF ]]; then
37+
git rm -rf ./snapshot/WEB-INF
3838
fi
3939

4040
# copy the new GwtMaterialDemo the snapshot dir.
41-
unzip -u $TRAVIS_BUILD_DIR/target/gwt-material-demo-*.war -d ./
42-
rm -rf ./META-INF
43-
rm -rf ./WEB-INF
41+
unzip -u $TRAVIS_BUILD_DIR/target/gwt-material-demo-*.war -d ./snapshot/
42+
rm -rf ./snapshot/META-INF
43+
rm -rf ./snapshot/WEB-INF
4444

4545
git add -f .
4646
git commit -m "Auto-push demo to gh-pages successful. (Travis build: $TRAVIS_BUILD_NUMBER)"

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
#gwt-material-demo [![Build Status](https://travis-ci.org/GwtMaterialDesign/gwt-material-demo.svg?branch=master)](https://travis-ci.org/GwtMaterialDesign/gwt-material-demo)
33
Demo application to show the features of the [gwt-material](https://github.com/GwtMaterialDesign/gwt-material) library.
44

5-
### Release 2.0-rc2 Demo
5+
### Release 2.0-rc3 Demo
66
[http://gwtmaterialdesign.github.io/gwt-material-demo](http://gwtmaterialdesign.github.io/gwt-material-demo)
77
```xml
88
<dependency>
99
<groupId>com.github.gwtmaterialdesign</groupId>
1010
<artifactId>gwt-material-demo</artifactId>
11-
<version>2.0-rc2</version>
11+
<version>2.0-rc3</version>
1212
</dependency>
1313
```
1414

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
<parent>
55
<artifactId>gwt-material-parent</artifactId>
66
<groupId>com.github.gwtmaterialdesign</groupId>
7-
<version>2.0-rc2</version>
7+
<version>2.0-rc3</version>
88
</parent>
99

1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>gwt-material-demo</artifactId>
1313
<packaging>war</packaging>
14-
<version>2.0-rc2</version>
14+
<version>2.0-rc3</version>
1515
<name>Gwt Material Demo</name>
1616
<description>Showcase for gwt-material</description>
1717

@@ -34,8 +34,8 @@
3434
<gwt.version>2.8.0</gwt.version>
3535
<gwtp.version>1.5.3</gwtp.version>
3636
<gin.version>2.1.2</gin.version>
37-
<gwt-material.version>2.0-rc2</gwt-material.version>
38-
<gwt-material-table.version>1.0-rc2</gwt-material-table.version>
37+
<gwt-material.version>2.0-rc3</gwt-material.version>
38+
<gwt-material-table.version>1.0-rc3</gwt-material-table.version>
3939

4040
<gwt.style>PRETTY</gwt.style>
4141

‎src/main/java/gwt/material/design/demo/client/ThemeManager.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ public static void register(MaterialWidget widget, int shade) {
117117
if (!map.containsKey(widget)) {
118118
map.put(widget, shade);
119119
}
120+
initialize();
120121
}
121122

122123
public static ThemeLoader.ThemeBundle getBundle() {

‎src/main/java/gwt/material/design/demo/client/application/ApplicationPresenter.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.gwtplatform.mvp.client.proxy.NavigationEvent;
3232
import com.gwtplatform.mvp.client.proxy.NavigationHandler;
3333
import com.gwtplatform.mvp.client.proxy.Proxy;
34+
import gwt.material.design.client.ui.MaterialToast;
3435
import gwt.material.design.demo.client.application.menu.MenuPresenter;
3536

3637
import javax.inject.Inject;

‎src/main/java/gwt/material/design/demo/client/application/ApplicationView.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public interface Binder extends UiBinder<Widget, ApplicationView> {
5151
initWidget(uiBinder.createAndBindUi(this));
5252
ThemeManager.register(footer);
5353
ThemeManager.register(footerCopyRight, ThemeManager.DARKER_SHADE);
54+
ThemeManager.initialize();
5455
bindSlot(ApplicationPresenter.SLOT_MENU, menu);
5556
bindSlot(ApplicationPresenter.SLOT_MAIN, main);
5657
DOM.removeChild(RootPanel.getBodyElement(), DOM.getElementById("splashscreen"));

‎src/main/java/gwt/material/design/demo/client/application/about/AboutView.ui.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<ui:with field='res' type='gwt.material.design.demo.client.resources.MaterialResources' />
2424

2525
<g:HTMLPanel addStyleNames="center-align">
26-
<m:MaterialRow>
26+
<m:MaterialRow marginTop="60">
2727
<m:MaterialImage resource="{res.ic_front}"/>
2828
<m:MaterialTitle title="What is Material Design?" description="Created and designed by Google, Material Design is a design language that combines the classic principles of successful design along with innovation and technology. Google's goal is to develop a system of design that allows for a unified user experience across all their products on any platform." />
2929
</m:MaterialRow>

‎src/main/java/gwt/material/design/demo/client/application/addins/avatar/AvatarView.ui.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
<m:MaterialTitle title="initialize()" description="You can easily update the avatar during textbox key up events." />
4141
<m:MaterialRow>
4242
<m:MaterialColumn grid="l6 m6 s12">
43-
<m:MaterialCard padding="20" marginTop="100" textAlign="CENTER">
43+
<m:MaterialCard padding="20" marginTop="100" height="200px" textAlign="CENTER">
4444
<ma:avatar.MaterialAvatar ui:field="avatar" backgroundColor="WHITE" marginTop="-100" name="marjorie" width="150" height="150" shadow="1" circle="true" />
45-
<m:MaterialTextBox ui:field="txtAvatarName" placeholder="Avatar Name" text="marjorie"/>
45+
<m:MaterialTextBox ui:field="txtAvatarName" grid="s12" placeholder="Avatar Name" text="marjorie"/>
4646
</m:MaterialCard>
4747
</m:MaterialColumn>
4848
</m:MaterialRow>

‎src/main/java/gwt/material/design/demo/client/application/addins/combobox/ComboBoxView.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ interface Binder extends UiBinder<Widget, ComboBoxView> {
5151
@UiField
5252
MaterialComboBox<State> comboTimeZone8, comboTimeZone8_1, comboTimeZone9, comboTimeZone9_1, comboTimeZone10,
5353
comboTimeZone11, comboTimeZone12, comboTimeZone12_1, comboTimeZone13, comboTimeZone14,
54-
comboTimeZone15, comboTimeZone16, comboTimeZone17;
54+
comboTimeZone15, comboTimeZone16, comboTimeZone17, comboCloseOnSelect;
5555

5656
@UiField
5757
MaterialModal modal;
@@ -84,6 +84,7 @@ protected void populateTimeZones() {
8484
addStateItems(comboTimeZone14);
8585
addStateItems(comboTimeZone15);
8686
addStateItems(comboTimeZone17);
87+
addItemsWithoutGroup(comboCloseOnSelect);
8788

8889
comboTimeZone8.addValueChangeHandler(valueChangeEvent -> {
8990
MaterialToast.fireToast("Event: ValueChange State : " + valueChangeEvent.getValue().getName() + " Value: " + valueChangeEvent.getValue().getValue());

‎src/main/java/gwt/material/design/demo/client/application/addins/combobox/ComboBoxView.ui.xml‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646
<m:MaterialRow addStyleNames="code">
4747
<m:MaterialColumn grid="l6 m6 s12">
4848
<m:MaterialTitle title="Label and Placeholder" description="On Combo Box we have two types of labeling your component. They are label and placeholder." />
49-
<combobox:MaterialComboBox ui:field="comboTimeZone2" multiple="true" label="This is label" placeholder="This is placeholder" />
49+
<combobox:MaterialComboBox ui:field="comboTimeZone2" closeOnSelect="false" multiple="true" label="This is label" placeholder="This is placeholder" />
5050
</m:MaterialColumn>
5151
<m:MaterialColumn grid="l12 m12 s12">
5252
<demo:PrettyPre addStyleNames="lang-xml">
53-
&emsp;&lt;combobox:MaterialComboBox ui:field="comboTimeZone2" multiple="true" label="This is label" placeholder="This is placeholder" />
53+
&emsp;&lt;combobox:MaterialComboBox ui:field="comboTimeZone2" closeOnSelect="false" multiple="true" label="This is label" placeholder="This is placeholder" />
5454
</demo:PrettyPre>
5555
</m:MaterialColumn>
5656
</m:MaterialRow>
@@ -108,11 +108,11 @@
108108
<m:MaterialRow addStyleNames="code">
109109
<m:MaterialColumn grid="l6 m6 s12">
110110
<m:MaterialTitle title="Allow Clear" description="We added a built in clear icon to easily clear all items on Multiple Combobox" />
111-
<combobox:MaterialComboBox ui:field="comboTimeZone3" placeholder="TimeZone" multiple="true" allowClear="true" />
111+
<combobox:MaterialComboBox ui:field="comboTimeZone3" placeholder="TimeZone" closeOnSelect="false" multiple="true" allowClear="true" />
112112
</m:MaterialColumn>
113113
<m:MaterialColumn grid="s12">
114114
<demo:PrettyPre addStyleNames="lang-xml">
115-
&emsp;&lt;combobox:MaterialComboBox ui:field="comboTimeZone3" placeholder="TimeZone" multiple="true" allowClear="true" />
115+
&emsp;&lt;combobox:MaterialComboBox ui:field="comboTimeZone3" placeholder="TimeZone" closeOnSelect="false" multiple="true" allowClear="true" />
116116
</demo:PrettyPre>
117117
</m:MaterialColumn>
118118
</m:MaterialRow>
@@ -143,11 +143,11 @@
143143
<m:MaterialRow addStyleNames="code">
144144
<m:MaterialColumn grid="l6 m6 s12">
145145
<m:MaterialTitle title="Multiple Select" description="Just like Autocomplete you can have a capability to select ComboBox options multiple."/>
146-
<combobox:MaterialComboBox multiple="true" ui:field="comboTimeZone4" placeholder="TimeZone"/>
146+
<combobox:MaterialComboBox closeOnSelect="false" multiple="true" ui:field="comboTimeZone4" placeholder="TimeZone"/>
147147
</m:MaterialColumn>
148148
<m:MaterialColumn grid="s12">
149149
<demo:PrettyPre addStyleNames="lang-xml">
150-
&lt;combobox:MaterialComboBox multiple="true" ui:field="comboTimeZone4" placeholder="TimeZone"/>
150+
&lt;combobox:MaterialComboBox closeOnSelect="false" multiple="true" ui:field="comboTimeZone4" placeholder="TimeZone"/>
151151
</demo:PrettyPre>
152152
</m:MaterialColumn>
153153
</m:MaterialRow>
@@ -193,11 +193,23 @@
193193
<m:MaterialRow addStyleNames="code">
194194
<m:MaterialColumn grid="l6 m6 s12">
195195
<m:MaterialTitle title="Limit" description="You can set the item limit on multiple combobox."/>
196-
<combobox:MaterialComboBox multiple="true" limit="2" placeholder="Time Zone" ui:field="comboTimeZone7" />
196+
<combobox:MaterialComboBox closeOnSelect="false" multiple="true" limit="2" placeholder="Time Zone" ui:field="comboTimeZone7" />
197197
</m:MaterialColumn>
198198
<m:MaterialColumn grid="s12">
199199
<demo:PrettyPre addStyleNames="lang-xml">
200-
&emsp;&lt;combobox:MaterialComboBox multiple="true" limit="2" placeholder="Time Zone" ui:field="comboTimeZone7" />
200+
&emsp;&lt;combobox:MaterialComboBox closeOnSelect="false" multiple="true" limit="2" placeholder="Time Zone" ui:field="comboTimeZone7" />
201+
</demo:PrettyPre>
202+
</m:MaterialColumn>
203+
</m:MaterialRow>
204+
205+
<m:MaterialRow addStyleNames="code">
206+
<m:MaterialColumn grid="l6 m6 s12">
207+
<m:MaterialTitle title="Close On Select" description="Allow or Prevent the dropdown from closing when a result is selected (Default : true)"/>
208+
<combobox:MaterialComboBox closeOnSelect="false" multiple="true" placeholder="Time Zone" ui:field="comboCloseOnSelect" />
209+
</m:MaterialColumn>
210+
<m:MaterialColumn grid="s12">
211+
<demo:PrettyPre addStyleNames="lang-xml">
212+
&emsp;&lt;combobox:MaterialComboBox closeOnSelect="false" multiple="true" placeholder="Time Zone" ui:field="comboCloseOnSelect" />
201213
</demo:PrettyPre>
202214
</m:MaterialColumn>
203215
</m:MaterialRow>
@@ -206,7 +218,7 @@
206218
<m:MaterialColumn grid="l6 m6 s12">
207219
<m:MaterialTitle title="Value Change Event" description="This event will be fired when changing values on combobox"/>
208220
<combobox:MaterialComboBox placeholder="Time Zone" ui:field="comboTimeZone8" />
209-
<combobox:MaterialComboBox placeholder="Time Zone" multiple="true" ui:field="comboTimeZone8_1" />
221+
<combobox:MaterialComboBox placeholder="Time Zone" closeOnSelect="false" multiple="true" ui:field="comboTimeZone8_1" />
210222
</m:MaterialColumn>
211223
<m:MaterialColumn grid="s12">
212224
<demo:PrettyPre addStyleNames="lang-java">
@@ -221,7 +233,7 @@
221233
<m:MaterialColumn grid="l6 m6 s12">
222234
<m:MaterialTitle title="Selection Event" description="This event will be fired when Selecting values on combobox"/>
223235
<combobox:MaterialComboBox placeholder="Time Zone" ui:field="comboTimeZone9" />
224-
<combobox:MaterialComboBox placeholder="Time Zone" multiple="true" ui:field="comboTimeZone9_1" />
236+
<combobox:MaterialComboBox placeholder="Time Zone" closeOnSelect="false" multiple="true" ui:field="comboTimeZone9_1" />
225237
</m:MaterialColumn>
226238
<m:MaterialColumn grid="s12">
227239
<demo:PrettyPre addStyleNames="lang-java">
@@ -235,7 +247,7 @@
235247
<m:MaterialRow addStyleNames="code">
236248
<m:MaterialColumn grid="l6 m6 s12">
237249
<m:MaterialTitle title="Remove Item Event" description="This event will be fired when removing item/value on multiple combobox" />
238-
<combobox:MaterialComboBox placeholder="Time Zone" multiple="true" ui:field="comboTimeZone11" />
250+
<combobox:MaterialComboBox placeholder="Time Zone" closeOnSelect="false" multiple="true" ui:field="comboTimeZone11" />
239251
</m:MaterialColumn>
240252
<m:MaterialColumn grid="s12">
241253
<demo:PrettyPre addStyleNames="lang-java">
@@ -271,7 +283,7 @@
271283
</demo:PrettyPre>
272284
</m:MaterialColumn>
273285
<m:MaterialColumn grid="l6 m6 s12">
274-
<combobox:MaterialComboBox allowClear="true" placeholder="Time Zone" multiple="true" ui:field="comboTimeZone12_1" />
286+
<combobox:MaterialComboBox allowClear="true" placeholder="Time Zone" closeOnSelect="false" multiple="true" ui:field="comboTimeZone12_1" />
275287
<m:MaterialButton marginBottom="12" marginRight="12" ui:field="btnGetValues" text="Get Values" />
276288
</m:MaterialColumn>
277289
<m:MaterialColumn grid="s12">
@@ -297,7 +309,7 @@
297309
</m:MaterialColumn>
298310

299311
<m:MaterialColumn grid="l6 m6 s12">
300-
<combobox:MaterialComboBox placeholder="Time Zone" multiple="true" ui:field="comboTimeZone14" />
312+
<combobox:MaterialComboBox placeholder="Time Zone" closeOnSelect="false" multiple="true" ui:field="comboTimeZone14" />
301313
<m:MaterialButton marginBottom="12" marginRight="12" ui:field="btnSetValues" text="Set 'California' and 'Nevada'" />
302314
<m:MaterialButton marginBottom="12" marginRight="12" ui:field="btnGetValues2" text="Get Values" />
303315
</m:MaterialColumn>

0 commit comments

Comments
 (0)