#2009 change click handling order (compared to other variables) in Table

svn changeset:5299/svn branch:trunk

1 files changed, 3 insertions, 8 deletions

diff --git a/src/com/itmill/toolkit/ui/Table.java b/src/com/itmill/toolkit/ui/Table.java
index 1a5fb10a67..8dce0539e1 100644
--- a/src/com/itmill/toolkit/ui/Table.java
+++ b/src/com/itmill/toolkit/ui/Table.java
@@ -1575,6 +1575,8 @@ public class Table extends AbstractSelect implements Action.Container,
 
         boolean clientNeedsContentRefresh = false;
 
+        handleClickEvent(variables);
+
         disableContentRefreshing();
 
         if (!isSelectable() && variables.containsKey("selected")) {
@@ -1710,14 +1712,7 @@ public class Table extends AbstractSelect implements Action.Container,
             }
         }
 
-        // handle clicks before content refresh if content is refreshed anyway
-        if (clientNeedsContentRefresh) {
-            handleClickEvent(variables);
-            enableContentRefreshing(clientNeedsContentRefresh);
-        } else {
-            enableContentRefreshing(clientNeedsContentRefresh);
-            handleClickEvent(variables);
-        }
+        enableContentRefreshing(clientNeedsContentRefresh);
     }
 
     /**