From b8c6a15da87ff6d2a83e7c0d79dd45ee120fe6a2 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Fri, 10 May 2013 16:25:55 +0300 Subject: Clear items in ComboBox only if changed (#10924) Selection is now sent only as a key, removed redundant attribute on the item. Change-Id: I882d4ae17a1dc91f7a55a0b4a94e47c078ffc022 --- server/src/com/vaadin/ui/ComboBox.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'server/src/com') 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"); -- cgit v1.2.3