From 3928a8f233b1546c8914e105a41cc4f8871e7938 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Wed, 17 Apr 2013 17:33:16 +0300 Subject: Replaced Atmosphere portal implementation with the jQuery implementation (#11629) * jquery-1.7.2.rebased.js and jquery.atmosphere.rebased.js are imported from atmosphere-jquery and updated to use the jQueryVaadin namespace instead of jQuery and $ Change-Id: I1461ac7803e90d2a40b390551023a118ed5dc704 --- client/src/com/vaadin/client/communication/PushConnection.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'client') diff --git a/client/src/com/vaadin/client/communication/PushConnection.java b/client/src/com/vaadin/client/communication/PushConnection.java index e3d2e576e6..f72066c149 100644 --- a/client/src/com/vaadin/client/communication/PushConnection.java +++ b/client/src/com/vaadin/client/communication/PushConnection.java @@ -223,7 +223,8 @@ public class PushConnection { config.onTransportFailure = $entry(function(reason,request) { self.@com.vaadin.client.communication.PushConnection::onTransportFailure(*)(reason); }); - return $wnd.atmosphere.subscribe(config); + + return $wnd.jQueryVaadin.atmosphere.subscribe(config); }-*/; private native void doPush(JavaScriptObject socket, String message) -- cgit v1.2.3