diff options
| author | Artur Signell <artur@vaadin.com> | 2013-04-17 17:33:16 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-04-17 17:54:27 +0300 |
| commit | 3928a8f233b1546c8914e105a41cc4f8871e7938 (patch) | |
| tree | 402c6d2d7b648e23f18cca2ace121565d3f06895 /client | |
| parent | b8614ad16cac44637dbfa11829b4cb896c4ac9cf (diff) | |
| download | vaadin-framework-3928a8f233b1546c8914e105a41cc4f8871e7938.tar.gz vaadin-framework-3928a8f233b1546c8914e105a41cc4f8871e7938.zip | |
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
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/communication/PushConnection.java | 3 |
1 files changed, 2 insertions, 1 deletions
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) |