1.1 --- a/json/src/main/java/org/apidesign/html/json/spi/Proto.java	Mon Dec 23 20:39:24 2013 +0100
     1.2 +++ b/json/src/main/java/org/apidesign/html/json/spi/Proto.java	Mon Dec 23 20:44:23 2013 +0100
     1.3 @@ -91,6 +91,10 @@
     1.4          initBindings().applyBindings();
     1.5      }
     1.6      
     1.7 +    public void runInBrowser(Runnable run) {
     1.8 +        JSON.runInBrowser(context, run);
     1.9 +    }
    1.10 +    
    1.11      // XXX: Don't expose internal type
    1.12      public Bindings initBindings() {
    1.13          if (ko == null) {

     2.1 --- a/json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java	Mon Dec 23 20:39:24 2013 +0100
     2.2 +++ b/json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java	Mon Dec 23 20:44:23 2013 +0100
     2.3 @@ -329,7 +329,7 @@
     2.4                          tn = btn;
     2.5                      }
     2.6                      if (set != null) {
     2.7 -                        w.append("        case " + (i / 5) + ": data." + strip(set) + "(org.netbeans.html.json.impl.JSON.extractValue(" + tn + ".class, value)); return;\n");
     2.8 +                        w.append("        case " + (i / 5) + ": data." + strip(set) + "(TYPE.extractValue(" + tn + ".class, value)); return;\n");
     2.9                      }
    2.10                  }
    2.11                  w.append("      }\n");
    2.12 @@ -897,7 +897,7 @@
    2.13                      }
    2.14                  }
    2.15                  body.append(") {\n");
    2.16 -                body.append("    org.netbeans.html.json.impl.JSON.runInBrowser(proto.getContext(), new Runnable() { public void run() {\n");
    2.17 +                body.append("    proto.runInBrowser(new Runnable() { public void run() {\n");
    2.18                  body.append("      ").append(clazz.getSimpleName()).append(".").append(m.getSimpleName()).append("(");
    2.19                  body.append(className).append(".this");
    2.20                  for (String s : args) {