worker URL via require.uri()

cadorn · Mar 16, 2011 · 8a302b0 · 8a302b0
1 parent dfbf6b5
commit 8a302b0
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 78 deletions.
diff --git a/packages/ace-editor/modules/ace/worker/worker_client.js b/packages/ace-editor/modules/ace/worker/worker_client.js
@@ -16,8 +16,7 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {
 
     this.callbacks = [];
 
-    // TODO: This path should be configurable
-    this.$worker = new Worker("/ace/AceWorker.js");
+    this.$worker = new Worker(require.uri("worker/worker.js"));
 
     this.$worker.postMessage({
         init : true,

diff --git a/packages/ace-editor/package.json b/packages/ace-editor/package.json
@@ -5,6 +5,9 @@
         "lib": ""
     },
     "mappings": {
+        "worker": {
+            "id": "github.com/cadorn/ace-extjs/packages/ace-worker/"
+        },
         "ace": {
             "id": "github.com/ajaxorg/ace/"
         },

diff --git a/programs/ace-worker/program.json b/programs/ace-worker/program.json
diff --git a/programs/ace-editor/program.json → programs/ace/program.json b/programs/ace-editor/program.json → programs/ace/program.json
@@ -1,11 +1,22 @@
 {
     "boot": "github.com/cadorn/ace-extjs/packages/ace-editor/",
+    "contexts": {
+        "github.com/cadorn/ace-extjs/packages/ace-editor/@/main": {
+        },
+        "github.com/cadorn/ace-extjs/packages/ace-worker/@/worker": {
+        }
+    },
     "packages": {
         "github.com/cadorn/ace-extjs/packages/ace-editor/": {
             "locator": {
                 "location": "../../packages/ace-editor"
             }
         },
+        "github.com/cadorn/ace-extjs/packages/ace-worker/": {
+            "locator": {
+                "location": "../../packages/ace-worker"
+            }
+        },
         "github.com/ajaxorg/ace/": {
             "locator": {
                 "archive": "https://github.com/ajaxorg/ace/zipball/master",

diff --git a/programs/extjs3-ace/program.json b/programs/extjs3-ace/program.json
@@ -1,5 +1,11 @@
 {
     "boot": "github.com/cadorn/ace-extjs/packages/extjs3-ace/",
+    "contexts": {
+        "github.com/cadorn/ace-extjs/packages/extjs3-ace/@/lib/component": {
+        },
+        "github.com/cadorn/ace-extjs/packages/ace-worker/@/worker": {
+        }
+    },
     "packages": {
         "github.com/cadorn/ace-extjs/packages/extjs3-ace/": {
             "locator": {
@@ -11,6 +17,11 @@
                 "location": "../../packages/ace-editor"
             }
         },
+        "github.com/cadorn/ace-extjs/packages/ace-worker/": {
+            "locator": {
+                "location": "../../packages/ace-worker"
+            }
+        },
         "github.com/ajaxorg/ace/": {
             "locator": {
                 "archive": "https://github.com/ajaxorg/ace/zipball/master",

diff --git a/project.js b/project.js
@@ -28,12 +28,10 @@ exports.main = function()
             },
             map: {
                 "/ace/AceEditor.js": {
-                    programPath: PATH.dirname(module.id) + "/programs/ace-editor/program.json"
-                },
-                "/ace/AceWorker.js": {
-                    programPath: PATH.dirname(module.id) + "/programs/ace-worker/program.json"
+                    programPath: PATH.dirname(module.id) + "/programs/ace/program.json"
                 }
-            }
+            },
+            trackRoutes: true
         }).responder(null)))
         .use('/extjs3-ace', jsgi(new PROGRAM_SERVER.JSGI({
             api: {
@@ -43,7 +41,8 @@ exports.main = function()
                 "/extjs3-ace/Component.js": {
                     programPath: PATH.dirname(module.id) + "/programs/extjs3-ace/program.json"
                 }
-            }
+            },
+            trackRoutes: true
         }).responder(null)))
         .listen(port);
 }