diff options
| author | Artur Signell <artur.signell@itmill.com> | 2009-06-23 05:31:45 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2009-06-23 05:31:45 +0000 |
| commit | fcc5e9e01c97ff175270873a72c13d7d3f48b6c4 (patch) | |
| tree | c325d59b4919531a8f77dfd6b31d40ae10a95807 /src/com/vaadin/ui/Panel.java | |
| parent | db0ee82aee8566677b8fc4cc02eff1d40beadcd9 (diff) | |
| download | vaadin-framework-fcc5e9e01c97ff175270873a72c13d7d3f48b6c4.tar.gz vaadin-framework-fcc5e9e01c97ff175270873a72c13d7d3f48b6c4.zip | |
New fix for #2941 - Panel/Window does not remove all action handlers on client-side
svn changeset:8222/svn branch:6.0
Diffstat (limited to 'src/com/vaadin/ui/Panel.java')
| -rw-r--r-- | src/com/vaadin/ui/Panel.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/com/vaadin/ui/Panel.java b/src/com/vaadin/ui/Panel.java index e50713846c..b8c6b1f222 100644 --- a/src/com/vaadin/ui/Panel.java +++ b/src/com/vaadin/ui/Panel.java @@ -225,10 +225,10 @@ public class Panel extends AbstractComponentContainer implements Scrollable, target.addVariable(this, "scrollTop", getScrollTop()); } - if (actionHandlers != null && !actionHandlers.isEmpty()) { - target.addVariable(this, "action", ""); - target.startTag("actions"); + target.addVariable(this, "action", ""); + target.startTag("actions"); + if (actionHandlers != null && !actionHandlers.isEmpty()) { for (final Iterator ahi = actionHandlers.iterator(); ahi.hasNext();) { final Action[] aa = ((Action.Handler) ahi.next()).getActions( null, this); @@ -261,8 +261,8 @@ public class Panel extends AbstractComponentContainer implements Scrollable, } } } - target.endTag("actions"); } + target.endTag("actions"); } @Override @@ -327,8 +327,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, * Called when one or more variables handled by the implementing class are * changed. * - * @see com.vaadin.terminal.VariableOwner#changeVariables(Object, - * Map) + * @see com.vaadin.terminal.VariableOwner#changeVariables(Object, Map) */ @Override public void changeVariables(Object source, Map variables) { |