Merged: Fix for #4004 PopupDateField - Wrong tabIndex for popup button

svn changeset:11838/svn branch:6.2

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
index 9b504bc5f3f96348852c0c7615b8179d283c4cd6..547af271791325423c01b41edfce4e791779c5c3 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
@@ -60,6 +60,13 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field,
         }\r
         calendarToggle.setEnabled(enabled);\r
 \r
+        // not a FocusWidget -> needs own tabindex handling\r
+        if (uidl.hasAttribute("tabindex")) {\r
+            // Set the same tab index as for the textfield. Tabbing then works\r
+            // as expected.\r
+            calendarToggle.setTabIndex(uidl.getIntAttribute("tabindex"));\r
+        }\r
+\r
         if (lastReadOnlyState != readonly) {\r
             updateWidth();\r
         }\r