diff options
| author | Artur Signell <artur@vaadin.com> | 2015-12-20 11:35:40 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-07-16 15:10:06 +0000 |
| commit | a6e9d0de179758c578cdb482f20af6d243ebf5f0 (patch) | |
| tree | 3b5da54ef2062c9c5d67b2e31fe000abd0f9b67e /client | |
| parent | c9ceada8cf73b9e5044c05c0fc071ec7b8c13e0a (diff) | |
| download | vaadin-framework-a6e9d0de179758c578cdb482f20af6d243ebf5f0.tar.gz vaadin-framework-a6e9d0de179758c578cdb482f20af6d243ebf5f0.zip | |
Use pure JS instead of JQuery JS for Atmosphere (#19396)
Change-Id: I20c6e98fe84f0e42c3aa7544a85d4283e2a21537
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/main/java/com/vaadin/client/ApplicationConfiguration.java | 7 | ||||
| -rw-r--r-- | client/src/main/java/com/vaadin/client/communication/AtmospherePushConnection.java | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java b/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java index f14802c931..a9fd9803c3 100644 --- a/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java +++ b/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java @@ -191,10 +191,9 @@ public class ApplicationConfiguration implements EntryPoint { */ private native String getAtmosphereJSVersion() /*-{ - if ($wnd.jQueryVaadin != undefined){ - return $wnd.jQueryVaadin.atmosphere.version; - } - else { + if ($wnd.vaadinPush && $wnd.vaadinPush.atmosphere) { + return $wnd.vaadinPush.atmosphere.version; + } else { return null; } }-*/; diff --git a/client/src/main/java/com/vaadin/client/communication/AtmospherePushConnection.java b/client/src/main/java/com/vaadin/client/communication/AtmospherePushConnection.java index dd44d1cb6b..f439d27107 100644 --- a/client/src/main/java/com/vaadin/client/communication/AtmospherePushConnection.java +++ b/client/src/main/java/com/vaadin/client/communication/AtmospherePushConnection.java @@ -556,7 +556,7 @@ public class AtmospherePushConnection implements PushConnection { self.@com.vaadin.client.communication.AtmospherePushConnection::onClientTimeout(*)(request); }); - return $wnd.jQueryVaadin.atmosphere.subscribe(config); + return $wnd.vaadinPush.atmosphere.subscribe(config); }-*/; private native void doPush(JavaScriptObject socket, String message) @@ -566,12 +566,12 @@ public class AtmospherePushConnection implements PushConnection { private static native void doDisconnect(String url) /*-{ - $wnd.jQueryVaadin.atmosphere.unsubscribeUrl(url); + $wnd.vaadinPush.atmosphere.unsubscribeUrl(url); }-*/; private static native boolean isAtmosphereLoaded() /*-{ - return $wnd.jQueryVaadin != undefined; + return $wnd.vaadinPush && $wnd.vaadinPush.atmosphere; }-*/; private void runWhenAtmosphereLoaded(final Command command) { |