diff options
| author | Artur <artur@vaadin.com> | 2017-04-20 13:14:05 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com> | 2017-04-20 13:14:05 +0300 |
| commit | dfd1f04f4f56f09d8487cf08abef2fc17d5c4169 (patch) | |
| tree | 9f6871aba2fde2f6a89652724b8aeef8ddb5fbde | |
| parent | 37219932b913179910fa4e0e005f9417eac93d95 (diff) | |
| download | vaadin-framework-dfd1f04f4f56f09d8487cf08abef2fc17d5c4169.tar.gz vaadin-framework-dfd1f04f4f56f09d8487cf08abef2fc17d5c4169.zip | |
Fix changing primary style name for NativeSelect (#9016)
| -rw-r--r-- | client/src/main/java/com/vaadin/client/ui/VNativeSelect.java | 2 | ||||
| -rw-r--r-- | uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectStyleNamesTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java b/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java index 46df030f95..d838d9b3dd 100644 --- a/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java +++ b/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java @@ -44,7 +44,7 @@ public class VNativeSelect extends FocusableFlowPanelComposite @Override public void setStylePrimaryName(String style) { super.setStylePrimaryName(style); - setStylePrimaryName(listBox.getElement(), style); + getListBox().setStyleName(style + "-select"); } /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectStyleNamesTest.java b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectStyleNamesTest.java index 7e032ba94b..f6137387d7 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectStyleNamesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectStyleNamesTest.java @@ -77,7 +77,7 @@ public class ListSelectStyleNamesTest extends SingleBrowserTest { assertStyleNames(nativeSelect, "newprimary", "v-widget", "custominitial", "newprimary-custominitial", "new", "newprimary-new"); - assertStyleNames(nativeSelectSelect, "newprimary"); + assertStyleNames(nativeSelectSelect, "newprimary-select"); assertStyleNames(listSelect, "newprimary", "v-widget", "custominitial", "newprimary-custominitial", "new", "newprimary-new"); assertStyleNames(listSelectSelect, "newprimary-select"); |