Skip to content

Commit edac50d

Browse files
committed
Fix some initialization issues in MaterialDatePicker.
1 parent 491fdc7 commit edac50d

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

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

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,6 @@ protected void initialize() {
160160
}
161161
pickatizedDateInput = $(dateInput.getElement()).pickadate(options).asElement();
162162
label.getElement().setAttribute("for", getPickerId());
163-
setDate(date);
164-
setDateMin(dateMin);
165-
setDateMax(dateMax);
166-
setPlaceholder(placeholder);
167163

168164
if(options.open == null) {
169165
options.open = this::onOpen;
@@ -187,7 +183,14 @@ protected void initialize() {
187183
$(pickatizedDateInput).pickadate("picker")
188184
.off(options)
189185
.on(options);
186+
190187
initialized = true;
188+
189+
// Set up date specific settings.
190+
// These values require initialization.
191+
setDate(date);
192+
setDateMin(dateMin);
193+
setDateMax(dateMax);
191194
}
192195

193196
/**
@@ -206,12 +209,10 @@ public void reinitialize() {
206209

207210
@Override
208211
public void clear() {
209-
if (initialized) {
210-
clearErrorOrSuccess();
211-
label.removeStyleName(CssName.ACTIVE);
212-
dateInput.removeStyleName(CssName.VALID);
213-
dateInput.clear();
214-
}
212+
clearErrorOrSuccess();
213+
label.removeStyleName(CssName.ACTIVE);
214+
dateInput.removeStyleName(CssName.VALID);
215+
dateInput.clear();
215216
}
216217

217218
/**
@@ -289,6 +290,7 @@ public Date getDateMin() {
289290
*/
290291
public void setDateMin(Date dateMin) {
291292
this.dateMin = dateMin;
293+
292294
if (initialized && dateMin != null) {
293295
$(pickatizedDateInput).pickadate("picker").set("min", JsDate.create((double) dateMin.getTime()));
294296
}
@@ -306,6 +308,7 @@ public Date getDateMax() {
306308
*/
307309
public void setDateMax(Date dateMax) {
308310
this.dateMax = dateMax;
311+
309312
if (initialized && dateMax != null) {
310313
$(pickatizedDateInput).pickadate("picker").set("max", JsDate.create((double) dateMax.getTime()));
311314
}
@@ -360,7 +363,7 @@ public String getPlaceholder() {
360363
public void setPlaceholder(String placeholder) {
361364
this.placeholder = placeholder;
362365

363-
if (initialized && placeholder != null) {
366+
if (placeholder != null) {
364367
lblPlaceholder.setText(placeholder);
365368
}
366369
}

0 commit comments

Comments
 (0)