diff options
author | Artur Signell <artur@vaadin.com> | 2013-10-15 09:33:43 +0300 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2013-10-15 13:20:54 +0000 |
commit | c7ae45cc2404c2eab557866f310a2bb2130ddffe (patch) | |
tree | 936195bde7d85b83670653e44174af7d0385cfd1 /server/src/com/vaadin/ui/AbstractComponent.java | |
parent | d461fb438f62b38d2082b41b0a3c7a1189927c3d (diff) | |
download | vaadin-framework-c7ae45cc2404c2eab557866f310a2bb2130ddffe.tar.gz vaadin-framework-c7ae45cc2404c2eab557866f310a2bb2130ddffe.zip |
Validate that the connector is enabled before triggering actions for it (#12743)
Automated test enabled only for IE9-IE11 because of #12785
Change-Id: I265e5d1ead3fa56469861c5a98dcc9d0106d1051
Diffstat (limited to 'server/src/com/vaadin/ui/AbstractComponent.java')
-rw-r--r-- | server/src/com/vaadin/ui/AbstractComponent.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java index 262d47af18..61bcf00ad8 100644 --- a/server/src/com/vaadin/ui/AbstractComponent.java +++ b/server/src/com/vaadin/ui/AbstractComponent.java @@ -27,6 +27,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import com.vaadin.event.ActionManager; +import com.vaadin.event.ConnectorActionManager; import com.vaadin.event.ShortcutListener; import com.vaadin.server.AbstractClientConnector; import com.vaadin.server.ComponentSizeValidator; @@ -90,7 +91,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * Keeps track of the Actions added to this component; the actual * handling/notifying is delegated, usually to the containing window. */ - private ActionManager actionManager; + private ConnectorActionManager actionManager; private boolean visible = true; @@ -929,7 +930,7 @@ public abstract class AbstractComponent extends AbstractClientConnector */ protected ActionManager getActionManager() { if (actionManager == null) { - actionManager = new ActionManager(); + actionManager = new ConnectorActionManager(this); setActionManagerViewer(); } return actionManager; |