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 2012/07/27 14:16:21 UTC
[1/2] git commit: Fix Native WebSocket's JavaScript (as Atmosphere
has been fixed recently).
Updated Branches:
refs/heads/master 360380415 -> ec8f46c32
Fix Native WebSocket's JavaScript (as Atmosphere has been fixed recently).
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ec8f46c3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ec8f46c3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ec8f46c3
Branch: refs/heads/master
Commit: ec8f46c32c0c5d5242fa39de0ca320e9efcd1447
Parents: 29ca55e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jul 27 15:15:44 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jul 27 15:15:44 2012 +0300
----------------------------------------------------------------------
.../wicket/ajax/res/js/wicket-ajax-jquery.js | 3 ++-
.../ws/api/res/js/wicket-websocket-jquery.js | 11 ++---------
2 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec8f46c3/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
index 0899950..bb54cf0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js
@@ -618,7 +618,8 @@
attrs: {},
steps: []
};
- this.loadedCallback(jQuery.parseXML(data), context);
+ var xmlDocument = Wicket.Xml.parse(data);
+ this.loadedCallback(xmlDocument, context);
var executer = new FunctionsExecuter(context.steps);
executer.start();
},
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec8f46c3/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 17e8775..5439715 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
@@ -49,17 +49,10 @@
self.ws.onmessage = function (event) {
- var call = new Wicket.Ajax.Call();
- var attrs = {};
- call._initializeDefaults(attrs);
- attrs.event = event;
- var jqXHR = {
- readyState : 4
- };
var message = event.data;
if (message && message.indexOf('<ajax-response>') > -1) {
- var xmlDocument = Wicket.Xml.parse(event.data);
- call.processAjaxResponse(xmlDocument, "success", jqXHR, attrs);
+ var call = new Wicket.Ajax.Call();
+ call.process(event.data);
}
else {
Wicket.Event.publish('/websocket/message', message);