1.1 --- a/ko-ws-tyrus/src/main/java/org/netbeans/html/wstyrus/LoadJSON.java	Wed May 27 23:37:25 2015 +0200
     1.2 +++ b/ko-ws-tyrus/src/main/java/org/netbeans/html/wstyrus/LoadJSON.java	Sun Nov 22 21:18:35 2015 +0100
     1.3 @@ -275,11 +275,12 @@
     1.4          }
     1.5      }
     1.6  
     1.7 -    @JavaScriptBody(args = {"object", "property"},
     1.8 -            body
     1.9 -            = "if (property === null) return object;\n"
    1.10 -            + "if (object === null) return null;\n"
    1.11 -            + "var p = object[property]; return p ? p : null;"
    1.12 +    @JavaScriptBody(args = {"object", "property"}, body =
    1.13 +        "var ret;\n" + 
    1.14 +        "if (property === null) ret = object;\n" + 
    1.15 +        "else if (object === null) ret = null;\n" + 
    1.16 +        "else ret = object[property];\n" + 
    1.17 +        "return ret ? (typeof ko === 'undefined' ? ret : ko.utils.unwrapObservable(ret)) : null;"
    1.18      )
    1.19      private static Object getProperty(Object object, String property) {
    1.20          return null;