Changeset 5232

Timestamp:

08/21/08 09:43:07 (3 months ago)

Author:

marc.englund@…

Message:

Displayed empty if value==null even if nullselection is not allowed. Fixes #1996

Files:

• trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/INativeSelect.java (modified) (4 diffs)

trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/INativeSelect.java

@@ -35 +35 @@
             select.addItem("", null);
         }
+        boolean selected = false;
         for (final Iterator i = uidl.getChildIterator(); i.hasNext();) {
             final UIDL optionUidl = (UIDL) i.next();
@@ -41 +42 @@
             if (optionUidl.hasAttribute("selected")) {
                 select.setItemSelected(select.getItemCount() - 1, true);
+                selected = true;
             }
         }
+        if (!selected && !isNullSelectionAllowed()) {
+            // null-select not allowed, but value not selected yet; add null and
+            // remove when something is selected
+            select.insertItem("", null, 0);
+            select.setItemSelected(0, true);
+        }
+
     }
 
@@ -56 +65 @@
 
     public void onChange(Widget sender) {
+
         if (select.isMultipleSelect()) {
             client.updateVariable(id, "selected", getSelectedItems(),
@@ -62 +72 @@
             client.updateVariable(id, "selected", new String[] { ""
                     + getSelectedItem() }, isImmediate());
+        }
+        if (!isNullSelectionAllowed() && "null".equals(select.getValue(0))) {
+            // remove temporary empty item
+            select.removeItem(0);
         }
     }