# HG changeset patch # User Jaroslav Tulach # Date 1359116788 -3600 # Node ID 09f051f10096842df22fcd1d472ff0bdefcd9e23 # Parent 2f42cd9b553155f923969406bf72f3ed2efc18c8 Simplify the HTML page by including just one vm.js with everything diff -r 2f42cd9b5531 -r 09f051f10096 launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java --- a/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java Fri Jan 25 10:51:20 2013 +0100 +++ b/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java Fri Jan 25 13:26:28 2013 +0100 @@ -126,12 +126,7 @@ HttpServer s = HttpServer.createSimpleServer(".", new PortRange(8080, 65535)); final ServerConfiguration conf = s.getServerConfiguration(); - conf.addHttpHandler(new Page(resources, - "org/apidesign/bck2brwsr/launcher/console.xhtml", - "org.apidesign.bck2brwsr.launcher.Console", "welcome", "false" - ), "/console"); - conf.addHttpHandler(new VM(resources), "/bck2brwsr.js"); - conf.addHttpHandler(new VMInit(), "/vm.js"); + conf.addHttpHandler(new VM(resources), "/vm.js"); conf.addHttpHandler(new Classes(resources), "/classes/"); return s; } @@ -415,6 +410,16 @@ public VM(Res loader) throws IOException { StringBuilder sb = new StringBuilder(); Bck2Brwsr.generate(sb, loader); + sb.append( + "function ldCls(res) {\n" + + " var request = new XMLHttpRequest();\n" + + " request.open('GET', '/classes/' + res, false);\n" + + " request.send();\n" + + " var arr = eval('(' + request.responseText + ')');\n" + + " return arr;\n" + + "}\n" + + "var vm = new bck2brwsr(ldCls);\n" + ); this.bck2brwsr = sb.toString(); } @@ -425,25 +430,6 @@ response.getWriter().write(bck2brwsr); } } - private static class VMInit extends HttpHandler { - public VMInit() { - } - - @Override - public void service(Request request, Response response) throws Exception { - response.setCharacterEncoding("UTF-8"); - response.setContentType("text/javascript"); - response.getWriter().append( - "function ldCls(res) {\n" - + " var request = new XMLHttpRequest();\n" - + " request.open('GET', '/classes/' + res, false);\n" - + " request.send();\n" - + " var arr = eval('(' + request.responseText + ')');\n" - + " return arr;\n" - + "}\n" - + "var vm = new bck2brwsr(ldCls);\n"); - } - } private static class Classes extends HttpHandler { private final Res loader; diff -r 2f42cd9b5531 -r 09f051f10096 launcher/src/main/resources/org/apidesign/bck2brwsr/launcher/harness.xhtml --- a/launcher/src/main/resources/org/apidesign/bck2brwsr/launcher/harness.xhtml Fri Jan 25 10:51:20 2013 +0100 +++ b/launcher/src/main/resources/org/apidesign/bck2brwsr/launcher/harness.xhtml Fri Jan 25 13:26:28 2013 +0100 @@ -24,7 +24,6 @@ Bck2Brwsr Harness -

Bck2Brwsr Execution Harness