Skip to content

Commit 034df24

Browse files
committed
Remove setEnabled from MaterialDropDown & add example UiBinder test modification.
1 parent 1639230 commit 034df24

File tree

4 files changed

+26
-33
lines changed

4 files changed

+26
-33
lines changed

gwt-material/src/main/java/gwt/material/design/client/base/MaterialWidget.java

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import gwt.material.design.client.events.DragOverEvent;
3939
import gwt.material.design.client.events.DragStartEvent;
4040
import gwt.material.design.client.events.DropEvent;
41+
import gwt.material.design.client.events.OrientationChangeEvent.OrientationChangeHandler;
4142
import gwt.material.design.jquery.client.api.JQuery;
4243
import gwt.material.design.jquery.client.api.JQueryElement;
4344

@@ -496,18 +497,12 @@ public WavesType getWaves() {
496497

497498
@Override
498499
public void setDataAttribute(String dataAttr, String value) {
499-
if (!dataAttr.startsWith("data-")) {
500-
dataAttr = "data-" + dataAttr;
501-
}
502-
getElement().setAttribute(dataAttr, value);
500+
getElement().setAttribute(!dataAttr.startsWith("data-") ? "data-" + dataAttr : dataAttr, value);
503501
}
504502

505503
@Override
506504
public String getDataAttribute(String dataAttr) {
507-
if (!dataAttr.startsWith("data-")) {
508-
dataAttr = "data-" + dataAttr;
509-
}
510-
return getElement().getAttribute(dataAttr);
505+
return getElement().getAttribute(!dataAttr.startsWith("data-") ? "data-" + dataAttr : dataAttr);
511506
}
512507

513508
@Override
@@ -1276,13 +1271,10 @@ public HandlerRegistration addFocusHandler(FocusHandler handler) {
12761271
}
12771272

12781273
@Override
1279-
public HandlerRegistration addOrientationChangeHandler(OrientationChangeEvent.OrientationChangeHandler handler) {
1280-
return addHandler(new OrientationChangeEvent.OrientationChangeHandler() {
1281-
@Override
1282-
public void onOrientationChange(OrientationChangeEvent event) {
1283-
if (isEnabled()) {
1284-
handler.onOrientationChange(event);
1285-
}
1274+
public HandlerRegistration addOrientationChangeHandler(OrientationChangeHandler handler) {
1275+
return addHandler(event -> {
1276+
if (isEnabled()) {
1277+
handler.onOrientationChange(event);
12861278
}
12871279
}, OrientationChangeEvent.TYPE);
12881280
}

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ protected void registerDropdownItemHandlers() {
117117
ListItem item = (ListItem) widget;
118118
if (item.getWidget(0) instanceof MaterialWidget) {
119119
MaterialWidget child = (MaterialWidget) item.getWidget(0);
120-
registerHandler(child.addDomHandler(event -> SelectionEvent.fire(MaterialDropDown.this, child), ClickEvent.getType()));
120+
registerHandler(child.addDomHandler(event -> {
121+
SelectionEvent.fire(MaterialDropDown.this, child);
122+
}, ClickEvent.getType()));
121123
}
122124
}
123125
});
@@ -278,16 +280,6 @@ public void setActivator(String activator) {
278280
setId(activator);
279281
}
280282

281-
@Override
282-
public void setEnabled(boolean enabled) {
283-
super.setEnabled(enabled);
284-
Widget parent = getParent();
285-
if (parent instanceof HasEnabled) {
286-
((HasEnabled) parent).setEnabled(isEnabled());
287-
}
288-
reload();
289-
}
290-
291283
public List<Widget> getItems() {
292284
return getChildrenList();
293285
}

gwt-material/src/test/java/gwt/material/design/client/WidgetTestCase.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,20 @@ public T getWidget(boolean tryAttach) {
4343
widget = createWidget();
4444
}
4545
if(!neverAttach() && tryAttach && !widget.isAttached()) {
46-
RootPanel.get().add(widget);
47-
48-
if (unloadThenLoad()) {
49-
widget.removeFromParent();
50-
RootPanel.get().add(widget);
51-
}
46+
attachWidget();
5247
}
5348
return widget;
5449
}
5550

51+
protected void attachWidget() {
52+
RootPanel.get().add(widget);
53+
54+
if (unloadThenLoad()) {
55+
widget.removeFromParent();
56+
RootPanel.get().add(widget);
57+
}
58+
}
59+
5660
public boolean neverAttach() {
5761
return false;
5862
}

gwt-material/src/test/java/gwt/material/design/client/ui/base/MaterialWidgetTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ protected void checkVerticalAlign(MaterialWidget widget, Style.VerticalAlign val
6060

6161
public void testBorder() {
6262
// given
63-
T widget = getWidget();
63+
T widget = getWidget(false);
6464

6565
// when / then
6666
final String BORDER = "1px solid red";
@@ -69,6 +69,11 @@ public void testBorder() {
6969
final String BORDER_BOTTOM = "10px solid";
7070
final String BORDER_TOP = "5px ridge";
7171

72+
// test before attach
73+
widget.setBorder(BORDER);
74+
75+
attachWidget();
76+
7277
widget.setBorder(BORDER);
7378
assertEquals(BORDER, widget.getBorder());
7479
assertEquals(BORDER, widget.getElement().getStyle().getProperty("border"));

0 commit comments

Comments
 (0)