Merging in the default branch changes that make the system functional on Dlvk async
authorJaroslav Tulach <jaroslav.tulach@netbeans.org>
Sun, 09 Mar 2014 20:20:01 +0100
branchasync
changeset 59125b9c424f7e8
parent 589 07daf24cd76c
parent 590 17e3ded623a0
child 592 17450760bf14
Merging in the default branch changes that make the system functional on Dlvk
ko4j/src/main/java/org/netbeans/html/ko4j/Knockout.java
     1.1 --- a/ko4j/src/main/java/org/netbeans/html/ko4j/FXContext.java	Sun Mar 09 14:49:43 2014 +0100
     1.2 +++ b/ko4j/src/main/java/org/netbeans/html/ko4j/FXContext.java	Sun Mar 09 20:20:01 2014 +0100
     1.3 @@ -50,7 +50,6 @@
     1.4  import java.io.Reader;
     1.5  import java.net.URL;
     1.6  import java.util.logging.Logger;
     1.7 -import net.java.html.js.JavaScriptBody;
     1.8  import org.apidesign.html.boot.spi.Fn;
     1.9  import org.apidesign.html.json.spi.FunctionBinding;
    1.10  import org.apidesign.html.json.spi.JSONCall;
    1.11 @@ -76,11 +75,6 @@
    1.12      public FXContext(Fn.Presenter browserContext) {
    1.13      }
    1.14      
    1.15 -    @JavaScriptBody(args = {}, body = "if (window.WebSocket) return true; else return false;")
    1.16 -    final boolean areWebSocketsSupported() {
    1.17 -        return false;
    1.18 -    }
    1.19 -
    1.20      @Override
    1.21      public Object wrapModel(Object model, PropertyBinding[] propArr, FunctionBinding[] funcArr) {
    1.22          String[] propNames = new String[propArr.length];
    1.23 @@ -213,6 +207,10 @@
    1.24          socket.close();
    1.25      }
    1.26  
    1.27 +    boolean areWebSocketsSupported() {
    1.28 +        return Knockout.areWebSocketsSupported();
    1.29 +    }
    1.30 +
    1.31      private static final class TrueFn extends Fn implements Fn.Presenter {
    1.32          @Override
    1.33          public Object invoke(Object thiz, Object... args) throws Exception {
     2.1 --- a/ko4j/src/main/java/org/netbeans/html/ko4j/Knockout.java	Sun Mar 09 14:49:43 2014 +0100
     2.2 +++ b/ko4j/src/main/java/org/netbeans/html/ko4j/Knockout.java	Sun Mar 09 20:20:01 2014 +0100
     2.3 @@ -149,4 +149,9 @@
     2.4      static Object toModel(Object wrapper) {
     2.5          return toModelImpl(wrapper);
     2.6      }
     2.7 +    
     2.8 +    @JavaScriptBody(args = {}, body = "if (window.WebSocket) return true; else return false;")
     2.9 +    static final boolean areWebSocketsSupported() {
    2.10 +        return false;
    2.11 +    }
    2.12  }