Updated Branches: refs/heads/master 6dcd7f7c3 -> 57a16f1a7
WICKET-5423 Create IResource based implementation of Native Web Sockets Use 'false' as a falsy value for pageId. '0' is a valid pageId Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/57a16f1a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/57a16f1a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/57a16f1a Branch: refs/heads/master Commit: 57a16f1a7d63a921154d911883a695f77efd7150 Parents: 6dcd7f7 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Nov 22 14:51:35 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Nov 22 14:51:35 2013 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java | 2 +- .../wicket/protocol/ws/api/res/js/wicket-websocket-jquery.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/57a16f1a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java index d3999e9..e9e2406 100644 --- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java +++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java @@ -91,7 +91,7 @@ public class BaseWebSocketBehavior extends Behavior else { variables.put("resourceName", resourceName); - variables.put("pageId", 0); + variables.put("pageId", false); } Url baseUrl = component.getRequestCycle().getUrlRenderer().getBaseUrl(); http://git-wip-us.apache.org/repos/asf/wicket/blob/57a16f1a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/res/js/wicket-websocket-jquery.js ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/res/js/wicket-websocket-jquery.js b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/res/js/wicket-websocket-jquery.js index e879663..5c07a44 100644 --- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/res/js/wicket-websocket-jquery.js +++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/res/js/wicket-websocket-jquery.js @@ -46,7 +46,7 @@ url = protocol + '//' + document.location.host + Wicket.WebSocket.contextPath + '/wicket/websocket'; - if (Wicket.WebSocket.pageId) { + if (Wicket.WebSocket.pageId !== false) { url += '?pageId=' + Wicket.WebSocket.pageId; } else if (Wicket.WebSocket.resourceName) { url += '?resourceName=' + Wicket.WebSocket.resourceName;
