Fix for #5502 - First menu item is rendered as active when other item is clicked

svn changeset:16147/svn branch:6.5

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
index 5214b86b285f392fdf5a9d96a4a58db2c7c08346..598543fa100f16955e9fb7eea36cda37ac90d146 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
@@ -73,7 +73,6 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable,
     protected CustomMenuItem selected;
 
     private Timer layoutTimer;
-    private Timer focusDelayTimer;
 
     private boolean enabled = true;
 
@@ -296,12 +295,6 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable,
      *            id of the item that was clicked
      */
     public void onMenuClick(int clickedItemId) {
-        // Cancel the focus event handling since focus was gained by
-        // clicking an item.
-        if (focusDelayTimer != null || subMenu) {
-            focusDelayTimer.cancel();
-        }
-
         // Updating the state to the server can not be done before
         // the server connection is known, i.e., before updateFromUIDL()
         // has been called.
@@ -1353,20 +1346,6 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable,
      * .dom.client.FocusEvent)
      */
     public void onFocus(FocusEvent event) {
-        /*
-         * Delay the action so a mouse click can cancel the blur event if needed
-         */
-        focusDelayTimer = new Timer() {
-            @Override
-            public void run() {
-                if (getSelected() == null) {
-                    // If nothing is selected then select the first item
-                    setSelected(items.get(0));
-                }
-            }
-        };
-
-        focusDelayTimer.schedule(100);
     }
 
     private final String SUBPART_PREFIX = "item";