Skip to content

Commit 5f4e6f5

Browse files
author
wassx
committed
Merge pull request #2 from GwtMaterialDesign/master
Update from original
2 parents 5625527 + 1aa1f04 commit 5f4e6f5

17 files changed

+779
-582
lines changed

README.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,19 @@
33
<img src="http://gwt-material.appspot.com/bin/ic_gwt_logo.png" />
44
<br/>
55
A Google Material Design wrapper for GWT <br>
6-
<a href="www.gwt-material.appspot.com">http://www.gwt-material.appspot.com</a>
6+
<a href="www.gwt-material.appspot.com">http://www.gwt-material.appspot.com</a><br/>
7+
<a href="https://www.bountysource.com/teams/gwtmaterialdesign/members"> Support us on Bountysource </a>
8+
9+
<h3>Upcoming Version 1.3.3</h3>
10+
<ul>
11+
<li><a href="http://gwt-material.appspot.com/#dialogs" >Toast with Action and Toast with Rounded Style </a></li>
12+
<li><a href="https://www.bountysource.com/teams/gwtmaterialdesign" >BountySource </a></li>
13+
<li><a href="http://gwt-material.appspot.com/#charts" >Material Charts v1 </a></li>
14+
<li><a href="http://gwt-material.appspot.com/#media" >Image Slider / Full Screen </a></li>
15+
<li>Fixed the Sidebar Waves on Collapsible Items</li>
16+
<li><a href="http://gwt-material.appspot.com/#forms" >Date Picker Selection Type -> Month Day, Month Day Year, Year, Day </a></li>
17+
</ul>
18+
719
<h3>Version 1.3.2</h3>
820
<ul>
921
<li><a href="http://gwt-material.appspot.com/#theme" >GWT Material Themes</a></li>

src/main/java/gwt/material/design/client/ui/MaterialCollapsibleItem.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@ public MaterialCollapsibleItem() {
3131
}
3232

3333
private UnorderedList ulPanel;
34+
private Widget header;
3435

3536
@UiChild(tagname = "header")
3637
public void addHeader(final Widget header) {
3738
header.addStyleName("collapsible-header");
39+
setHeader(header);
3840
this.add(header);
3941
}
4042

@@ -48,5 +50,13 @@ public void addContent(final Widget content) {
4850
ulPanel.getElement().getStyle().setMargin(0, Unit.EM);
4951
this.add(ulPanel);
5052
}
53+
54+
public Widget getHeader() {
55+
return header;
56+
}
57+
58+
public void setHeader(Widget header) {
59+
this.header = header;
60+
}
5161

5262
}

src/main/java/gwt/material/design/client/ui/MaterialDatePicker.java

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public interface MaterialDatePickerDelegate {
4949
private MaterialDatePickerType selectionType = MaterialDatePickerType.DAY;
5050
JavaScriptObject input;
5151
public MaterialDatePicker() {
52-
52+
5353
}
5454

5555
@Override
@@ -76,7 +76,12 @@ public static native void initDatePicker(String id, String typeName, MaterialDat
7676
selectYears: true,
7777
selectMonths: true
7878
});
79-
} else {
79+
}else if(typeName === "YEAR"){
80+
input = $wnd.jQuery('#' + id).pickadate({
81+
selectYears: true
82+
});
83+
}
84+
else {
8085
input = $wnd.jQuery('#' + id).pickadate();
8186
}
8287
@@ -101,7 +106,11 @@ public static native String getDatePickerValue(String id)/*-{
101106
}-*/;
102107

103108
private static native void setDatePickerValue(String value, String id)/*-{
104-
$wnd.jQuery('#' + id).val(value);
109+
var input = $wnd.jQuery('#' + id).pickadate();
110+
var picker = input.pickadate('picker');
111+
if(picker) {
112+
picker.set('select', 1429970887654);
113+
}
105114
}-*/;
106115

107116
native void initClickHandler(String id, MaterialDatePicker parent) /*-{
@@ -156,8 +165,8 @@ public void setDate(Date date) {
156165
this.date = date;
157166
DateTimeFormat sdf = DateTimeFormat.getFormat("d MMM, yyyy");
158167
setDatePickerValue(sdf.format(date), id);
159-
DateTimeFormat sdfSetter = DateTimeFormat.getFormat("yyyy-MM-dd");
160-
selectDate(sdfSetter.format(date), id, this);
168+
/*DateTimeFormat sdfSetter = DateTimeFormat.getFormat("yyyy-MM-dd");
169+
selectDate(sdfSetter.format(date), id, this);*/
161170
}
162171

163172
private native void selectDate(String date, String id, MaterialDatePicker parent) /*-{
@@ -183,7 +192,18 @@ public void setPlaceholder(String placeholder) {
183192
public enum MaterialDatePickerType {
184193
DAY,
185194
MONTH_DAY,
186-
YEAR_MONTH_DAY
195+
YEAR_MONTH_DAY,
196+
YEAR
187197
}
198+
199+
public MaterialDatePickerType getSelectionType() {
200+
return selectionType;
201+
}
202+
203+
public void setSelectionType(MaterialDatePickerType selectionType) {
204+
this.selectionType = selectionType;
205+
}
206+
207+
188208

189209
}

src/main/java/gwt/material/design/client/ui/MaterialLink.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public class MaterialLink extends FocusPanel {
3636
private String text = "";
3737
private String href = "";
3838
private String icon = "";
39+
private String target = "";
3940
private String iconPosition = "";
4041
private String textColor = "";
4142
protected String fontSize = "";
@@ -138,6 +139,8 @@ public void generateLink() {
138139

139140
if (!href.isEmpty())
140141
anchorElem.setHref(href);
142+
if(!target.isEmpty())
143+
anchorElem.setTarget(target);
141144
if (!textColor.isEmpty())
142145
anchorElem.addStyleName(textColor + "-text");
143146
if (!text.isEmpty()) {
@@ -266,5 +269,15 @@ public void setBadge(MaterialBadge badge) {
266269
this.badge = badge;
267270
}
268271

272+
public String getTarget() {
273+
return target;
274+
}
275+
276+
public void setTarget(String target) {
277+
this.target = target;
278+
generateLink();
279+
}
280+
281+
269282

270283
}

0 commit comments

Comments
 (0)