fixes #5972, Table now focused eagerly when interacting with mouse with a header cell. Previously the table was focused in at an invalid moment causing variables to be in wrong order and for the table in two patches.

svn changeset:15937/svn branch:6.5

1 files changed, 8 insertions, 2 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index b1ebb763bf..3c4d1136ed 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -1862,10 +1862,16 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                         onResizeEvent(event);
                     }
                 } else {
-                    handleCaptionEvent(event);
-                    if (DOM.eventGetType(event) == Event.ONMOUSEUP) {
+                    /*
+                     * Ensure focus before handling caption event. Otherwise
+                     * variables changed from caption event may be before
+                     * variables from other components that fire variables when
+                     * they lose focus.
+                     */
+                    if (DOM.eventGetType(event) == Event.ONMOUSEDOWN) {
                         scrollBodyPanel.setFocus(true);
                     }
+                    handleCaptionEvent(event);
                     event.stopPropagation();
                     event.preventDefault();
                 }