Repository: wicket Updated Branches: refs/heads/wicket-7.x e25eb04d4 -> 85e14e7e5
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 af67ba9e3a1e43d4ed4925ebb72efc8358e6565e. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/85e14e7e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/85e14e7e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/85e14e7e Branch: refs/heads/wicket-7.x Commit: 85e14e7e5151967ffa74d4f52fa9c0121fe84fae Parents: e25eb04 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Sun Dec 18 22:12:05 2016 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Sun Dec 18 22:12:05 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/85e14e7e/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 ca5189e..30a65e0 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.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.event.IEvent; -import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.protocol.ws.api.event.WebSocketAbortedPayload; import org.apache.wicket.protocol.ws.api.event.WebSocketBinaryPayload; import org.apache.wicket.protocol.ws.api.event.WebSocketClosedPayload; @@ -36,7 +33,6 @@ import org.apache.wicket.protocol.ws.api.message.ConnectedMessage; import org.apache.wicket.protocol.ws.api.message.ErrorMessage; 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 @@ -46,22 +42,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(IPartialPageRequestHandler.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
