# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1400841566 -7200
# Node ID 8eeb682738f0be12421e6f787404416c88c0f220
# Parent  b66d6e7756bbbc7925b0742660a7d48af8a52c50
Generated Script files can be specified on classpath

diff -r b66d6e7756bb -r 8eeb682738f0 javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calculator.xhtml
--- a/javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calculator.xhtml	Fri May 23 11:44:38 2014 +0200
+++ b/javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calculator.xhtml	Fri May 23 12:39:26 2014 +0200
@@ -90,11 +90,12 @@
         
         <div data-bind="text: displayPreview"></div>
         <script src="bck2brwsr.js"></script>
-        <script src="lib/emul-0.9-SNAPSHOT-rt.js"></script>
-        <script src="lib/javaquery.api-0.9-SNAPSHOT.js"></script>
-        <script src="app.js"></script>
         <script>
-            var vm = bck2brwsr();
+            var vm = bck2brwsr(
+                'app.js',
+                'lib/emul-0.9-SNAPSHOT-rt.js',
+                'lib/javaquery.api-0.9-SNAPSHOT.js'
+            );
             vm.loadClass('org.apidesign.bck2brwsr.demo.calc.staticcompilation.Calc');
         </script>
     </body>
diff -r b66d6e7756bb -r 8eeb682738f0 rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java
--- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java	Fri May 23 11:44:38 2014 +0200
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java	Fri May 23 12:39:26 2014 +0200
@@ -490,6 +490,15 @@
                 + "  global.bck2brwsr = function() {\n"
                 + "    var args = Array.prototype.slice.apply(arguments);\n"
                 + "    var resources = {};\n"
+                + "    function loadExtension(url) {\n"
+                + "      var xhr = new XMLHttpRequest();\n"
+                + "      xhr.open('GET', url, false);\n"
+                + "      xhr.send();\n"
+                + "      var script = document.createElement('script');\n"
+                + "      script.type = 'text/javascript';\n"
+                + "      script.text = xhr.responseText;\n"
+                + "      document.getElementsByTagName('head')[0].appendChild(script);\n"
+                + "    }\n"
                 + "    function registerResource(n, a64) {\n"
                 + "      var str = atob(a64);\n"
                 + "      var arr = [];\n"
@@ -525,14 +534,17 @@
                 + "      for (var i = 0; i < args.length; i++) {\n"
                 + "        var at = args[i];\n"
                 + "        var ret;\n"
-                + "        if (typeof at === 'function') ret = at(name, skip);\n"
+                + "        if (typeof at === 'string' && at.substring(at.length - 3) === '.js') {\n"
+                + "          loadExtension(at);\n"
+                + "          args[i] = null;\n"
+                + "        } else if (typeof at === 'function') ret = at(name, skip);\n"
                 + "        else {\n"
                 + "          var cp = vm['org_apidesign_vm4brwsr_ClassPath'];\n"
                 + "          if (!cp) throw 'Core Java library not registered. Cannot load from ' + at;\n"
                 + "          ret = cp(false).\n"
                 + "            loadBytes___3BLjava_lang_String_2Ljava_lang_Object_2II(name, args, i, skip);\n"
                 + "        }\n"
-                + "        if (ret !== null) return ret;\n"
+                + "        if (ret) return ret;\n"
                 + "      }\n"
                 + "      while (knownExtensions < extensions.length) {\n"
                 + "        vm['registerResource'] = registerResource;\n"