diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-05-17 15:10:48 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-05-17 15:10:48 +0300 |
| commit | 9b6b735752e2f30bcdf6a521e031a8de22343bb0 (patch) | |
| tree | cb40f3a2bb238057a3875aa4d2581ecda83667a7 /server | |
| parent | 2f6d5e0d8c7cf4912bb82207c0dbe26101d168cb (diff) | |
| parent | 42545ac81ae49cb9a3af2a8b3b06ba9525886b22 (diff) | |
| download | vaadin-framework-9b6b735752e2f30bcdf6a521e031a8de22343bb0.tar.gz vaadin-framework-9b6b735752e2f30bcdf6a521e031a8de22343bb0.zip | |
Merge changes from origin/7.0
55ea6dc More specific workaround for no rows in TreeTable with pagelenght = 0 (#9203)
dca728c Warn if using old widgetset (#11836)
936439d Verify that tests are run with the expected JRE version (#11835)
29eeda5 Merge "Clean up Table popup menu close handler to prevent a memory leak" from 6.8 (#11840)
6d7f5e4 Eliminate unnecessary conversions of option keys
b8c6a15 Clear items in ComboBox only if changed (#10924)
42545ac Fix NPE if there's no query in the URI (#11836)
Change-Id: I2e50ba59b45720a879c6e476333369523a730b9c
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/com/vaadin/ui/ComboBox.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/ComboBox.java b/server/src/com/vaadin/ui/ComboBox.java index 0f42749acd..88e895df82 100644 --- a/server/src/com/vaadin/ui/ComboBox.java +++ b/server/src/com/vaadin/ui/ComboBox.java @@ -262,8 +262,8 @@ public class ComboBox extends AbstractSelect implements target.addAttribute("nullselection", true); } target.addAttribute("key", key); - if (isSelected(id) && keyIndex < selectedKeys.length) { - target.addAttribute("selected", true); + if (keyIndex < selectedKeys.length && isSelected(id)) { + // at most one item can be selected at a time selectedKeys[keyIndex++] = key; } target.endTag("so"); |