Repository: wicket Updated Branches: refs/heads/wicket-6.x 5ce4f3e70 -> 3ad040872
WICKET-6296 Not possible to add WebSocketBehavior in ajax request Revert "WICKET-6152 Allow to add more than one WebSocketBehavior in the component tree" This reverts commit 0a1446208952bc237d983b1f6b0e9fe7349dd471. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3ad04087 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3ad04087 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3ad04087 Branch: refs/heads/wicket-6.x Commit: 3ad040872fef47c5f63f618e71806735916cd74e Parents: 5ce4f3e Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Sun Dec 18 22:14:02 2016 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Sun Dec 18 22:14:28 2016 +0100 ---------------------------------------------------------------------- .../protocol/ws/api/WebSocketBehavior.java | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/3ad04087/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketBehavior.java ---------------------------------------------------------------------- diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketBehavior.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketBehavior.java index dfb9be6..2f8c67c 100644 --- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketBehavior.java +++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketBehavior.java @@ -17,10 +17,7 @@ package org.apache.wicket.protocol.ws.api; import org.apache.wicket.Component; -import org.apache.wicket.MetaDataKey; -import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.event.IEvent; -import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.protocol.ws.api.event.WebSocketBinaryPayload; import org.apache.wicket.protocol.ws.api.event.WebSocketClosedPayload; import org.apache.wicket.protocol.ws.api.event.WebSocketConnectedPayload; @@ -32,7 +29,6 @@ import org.apache.wicket.protocol.ws.api.message.ClosedMessage; import org.apache.wicket.protocol.ws.api.message.ConnectedMessage; import org.apache.wicket.protocol.ws.api.message.IWebSocketPushMessage; import org.apache.wicket.protocol.ws.api.message.TextMessage; -import org.apache.wicket.request.cycle.RequestCycle; /** * A behavior that provides optional callbacks for the WebSocket @@ -42,22 +38,8 @@ import org.apache.wicket.request.cycle.RequestCycle; */ public abstract class WebSocketBehavior extends BaseWebSocketBehavior { - private final static MetaDataKey<Object> IS_JAVA_SCRIPT_CONTRIBUTED = new MetaDataKey<Object>() - {}; - - @Override - public void renderHead(Component component, IHeaderResponse response) + public WebSocketBehavior() { - RequestCycle cycle = component.getRequestCycle(); - if (cycle.find(AjaxRequestTarget.class) == null) - { - Object contributed = cycle.getMetaData(IS_JAVA_SCRIPT_CONTRIBUTED); - if (contributed == null) - { - cycle.setMetaData(IS_JAVA_SCRIPT_CONTRIBUTED, new Object()); - super.renderHead(component, response); - } - } } @Override
