diff options
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) { |