You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/06/20 21:07:47 UTC
[2/2] git commit: WICKET-5624 Do not throw when WebSocket is not
supported
WICKET-5624 Do not throw when WebSocket is not supported
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6fb280f6
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6fb280f6
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6fb280f6
Branch: refs/heads/wicket-6.x
Commit: 6fb280f691cd1380bede9b1c3b48ae625253866e
Parents: 4876e32
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 20 22:07:18 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 20 22:07:18 2014 +0300
----------------------------------------------------------------------
.../ws/api/res/js/wicket-websocket-jquery.js | 21 +++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6fb280f6/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-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/res/js/wicket-websocket-jquery.js b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/res/js/wicket-websocket-jquery.js
index 4e8f68d..0e51bdf 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/res/js/wicket-websocket-jquery.js
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/res/js/wicket-websocket-jquery.js
@@ -26,6 +26,16 @@
throw "Wicket.WebSocket needs wicket-ajax.js as prerequisite.";
}
+ jQuery.extend(Wicket.Event.Topic, {
+ WebSocket: {
+ Opened: "/websocket/open",
+ Message: "/websocket/message",
+ Closed: "/websocket/closed",
+ Error: "/websocket/error",
+ NotSupported: "/websocket/notsupported"
+ }
+ });
+
Wicket.WebSocket = Wicket.Class.create();
Wicket.WebSocket.prototype = {
@@ -33,6 +43,7 @@
ws: null,
initialize: function () {
+ var topics = Wicket.Event.Topic.WebSocket;
if (('WebSocket' in window)) {
@@ -58,7 +69,7 @@
self.ws = new WebSocket(url);
self.ws.onopen = function (evt) {
- Wicket.Event.publish('/websocket/open', evt);
+ Wicket.Event.publish(topics.Opened, evt);
};
self.ws.onmessage = function (event) {
@@ -69,7 +80,7 @@
call.process(message);
}
else {
- Wicket.Event.publish('/websocket/message', message);
+ Wicket.Event.publish(topics.Message, message);
}
};
@@ -77,7 +88,7 @@
if (self.ws) {
self.ws.close();
self.ws = null;
- Wicket.Event.publish('/websocket/closed', evt);
+ Wicket.Event.publish(topics.Closed, evt);
}
};
@@ -85,13 +96,13 @@
if (self.ws) {
self.ws.close();
self.ws = null;
- Wicket.Event.publish('/websocket/error', evt);
+ Wicket.Event.publish(topics.Error, evt);
}
};
} else {
var errMessage = '[WebSocket.initialize] WebSocket is not supported in your browser!';
Wicket.Log.error(errMessage);
- throw errMessage;
+ Wicket.Event.publish(topics.NotSupported, errMessage);
}
},