diff options
| author | Alexey Fansky <alexey.fansky@effective-soft.com> | 2015-04-15 12:12:11 -0700 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-04-16 09:42:39 +0000 |
| commit | 8ecdcd9d665acc7e6423aa9493a4302dfb266be2 (patch) | |
| tree | fdcbe9d334021bb2e70f3d3449a3afce9f0b554d /client/src | |
| parent | caeb5347caef8723ba90cdfcc3db7b5a2883b122 (diff) | |
| download | vaadin-framework-8ecdcd9d665acc7e6423aa9493a4302dfb266be2.tar.gz vaadin-framework-8ecdcd9d665acc7e6423aa9493a4302dfb266be2.zip | |
Keeping MenuItem custom classes when updating styles (#17427)
Change-Id: I54b7e700148797f0145c4ec5f1802ea999142ab3
Diffstat (limited to 'client/src')
| -rw-r--r-- | client/src/com/vaadin/client/ui/VMenuBar.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ui/VMenuBar.java b/client/src/com/vaadin/client/ui/VMenuBar.java index 08f70f4dde..823861534d 100644 --- a/client/src/com/vaadin/client/ui/VMenuBar.java +++ b/client/src/com/vaadin/client/ui/VMenuBar.java @@ -912,12 +912,24 @@ public class VMenuBar extends SimpleFocusablePanel implements SUBMENU_CLASSNAME_PREFIX, ""); } + String currentStyles = super.getStyleName(); + List<String> customStyles = new ArrayList<String>(); + for(String style : currentStyles.split(" ")) { + if(!style.isEmpty() && !style.startsWith(primaryStyleName)) { + customStyles.add(style); + } + } + if (isSeparator) { super.setStyleName(primaryStyleName + "-separator"); } else { super.setStyleName(primaryStyleName + "-menuitem"); } + for (String customStyle : customStyles) { + super.addStyleName(customStyle); + } + if (styleName != null) { addStyleDependentName(styleName); } |