From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 20 Oct 2009 05:36:37 +0000 (+0000)
Subject: actions no more handled in "updates-disabled" block, fixes #3551
X-Git-Tag: 6.7.0.beta1~2400
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ed57eb4ec06de4267567be8e1724fdc4f524ad45;p=vaadin-framework.git

actions no more handled in "updates-disabled" block, fixes #3551

svn changeset:9250/svn branch:6.2
---

diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index a35572100f..99e7cec3de 100644
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -1863,23 +1863,6 @@ public class Table extends AbstractSelect implements Action.Container,
             clientNeedsContentRefresh = true;
         }
 
-        // Actions
-        if (variables.containsKey("action")) {
-            final StringTokenizer st = new StringTokenizer((String) variables
-                    .get("action"), ",");
-            if (st.countTokens() == 2) {
-                final Object itemId = itemIdMapper.get(st.nextToken());
-                final Action action = (Action) actionMapper.get(st.nextToken());
-                if (action != null && containsId(itemId)
-                        && actionHandlers != null) {
-                    for (final Iterator<Handler> i = actionHandlers.iterator(); i
-                            .hasNext();) {
-                        (i.next()).handleAction(action, this, itemId);
-                    }
-                }
-            }
-        }
-
         if (!sortDisabled) {
             // Sorting
             boolean doSort = false;
@@ -1946,6 +1929,24 @@ public class Table extends AbstractSelect implements Action.Container,
         }
 
         enableContentRefreshing(clientNeedsContentRefresh);
+
+        // Actions
+        if (variables.containsKey("action")) {
+            final StringTokenizer st = new StringTokenizer((String) variables
+                    .get("action"), ",");
+            if (st.countTokens() == 2) {
+                final Object itemId = itemIdMapper.get(st.nextToken());
+                final Action action = (Action) actionMapper.get(st.nextToken());
+                if (action != null && containsId(itemId)
+                        && actionHandlers != null) {
+                    for (final Iterator<Handler> i = actionHandlers.iterator(); i
+                            .hasNext();) {
+                        (i.next()).handleAction(action, this, itemId);
+                    }
+                }
+            }
+        }
+
     }
 
     /**