Don't store the websocket information in a variable, rather query again as the Fn.Presenter may be different
authorJaroslav Tulach <jaroslav.tulach@netbeans.org>
Tue, 04 Feb 2014 13:27:08 +0100
changeset 522e5dc7cf92ce4
parent 521 0bac6ee0a6af
child 523 b0b4ab61e928
Don't store the websocket information in a variable, rather query again as the Fn.Presenter may be different
ko4j/src/main/java/org/netbeans/html/ko4j/FXContext.java
ko4j/src/main/java/org/netbeans/html/ko4j/LoadWS.java
     1.1 --- a/ko4j/src/main/java/org/netbeans/html/ko4j/FXContext.java	Tue Feb 04 09:46:12 2014 +0100
     1.2 +++ b/ko4j/src/main/java/org/netbeans/html/ko4j/FXContext.java	Tue Feb 04 13:27:08 2014 +0100
     1.3 @@ -102,9 +102,13 @@
     1.4      }
     1.5  
     1.6      final boolean areWebSocketsSupported() {
     1.7 -        return LoadWS.isSupported();
     1.8 +        return isWebSocket();
     1.9      }
    1.10  
    1.11 +    @JavaScriptBody(args = {}, body = "if (window.WebSocket) return true; else return false;")
    1.12 +    private static boolean isWebSocket() {
    1.13 +        return false;
    1.14 +    }
    1.15  
    1.16      @Override
    1.17      public Object wrapModel(Object model, PropertyBinding[] propArr, FunctionBinding[] funcArr) {
     2.1 --- a/ko4j/src/main/java/org/netbeans/html/ko4j/LoadWS.java	Tue Feb 04 09:46:12 2014 +0100
     2.2 +++ b/ko4j/src/main/java/org/netbeans/html/ko4j/LoadWS.java	Tue Feb 04 13:27:08 2014 +0100
     2.3 @@ -50,7 +50,6 @@
     2.4   * @author Jaroslav Tulach <jtulach@netbeans.org>
     2.5   */
     2.6  final class LoadWS {
     2.7 -    private static final boolean SUPPORTED = isWebSocket();
     2.8      private final Object ws;
     2.9      private final JSONCall call;
    2.10      LoadWS(JSONCall first, String url) {
    2.11 @@ -61,10 +60,6 @@
    2.12          }
    2.13      }
    2.14      
    2.15 -    static boolean isSupported() {
    2.16 -        return SUPPORTED;
    2.17 -    }
    2.18 -    
    2.19      void send(JSONCall call) {
    2.20          push(call);
    2.21      }
    2.22 @@ -101,11 +96,6 @@
    2.23          call.notifyError(null);
    2.24      }
    2.25      
    2.26 -    @JavaScriptBody(args = {}, body = "if (window.WebSocket) return true; else return false;")
    2.27 -    private static boolean isWebSocket() {
    2.28 -        return false;
    2.29 -    }
    2.30 -
    2.31      @JavaScriptBody(args = { "back", "url" }, javacall = true, body = ""
    2.32          + "if (window.WebSocket) {\n"
    2.33          + "  try {\n"