From d2b141b68e184411e4052f883c77f7095c376f3c Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian.jakobs@web.de>
Date: Tue, 18 Jan 2011 09:01:22 +0100
Subject: [PATCH] cleanup worker basics

---
 demo/startup.js                |  2 +-
 lib/ace/worker/Demo.js         |  6 +++---
 lib/ace/worker/WorkerClient.js | 14 +++-----------
 lib/ace/worker/host.js         | 17 +++++------------
 4 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/demo/startup.js b/demo/startup.js
index 7f32c255..41d8321f 100644
--- a/demo/startup.js
+++ b/demo/startup.js
@@ -68,7 +68,7 @@ exports.launch = function(env) {
     docs.js.setUndoManager(new UndoManager());
     
     var worker = new WorkerClient("../..", ["ace", "pilot"], "ace/worker/demo", "Demo");
-    
+    worker.send("juhu");
 
     docs.css = new Document(document.getElementById("csstext").innerHTML);
     docs.css.setMode(new CssMode());
diff --git a/lib/ace/worker/Demo.js b/lib/ace/worker/Demo.js
index 7d1fd5df..7d3b0689 100644
--- a/lib/ace/worker/Demo.js
+++ b/lib/ace/worker/Demo.js
@@ -1,9 +1,9 @@
 
 define(function(require, exports, module) {
     
-exports.Demo = function(sender) {
+var Demo = exports.Demo = function(sender) {
     this.sender = sender;
-}
+};
 
 (function() {
     
@@ -11,6 +11,6 @@ exports.Demo = function(sender) {
         console.log("JUHU")
     }
     
-}).call(exports.Demot.prototype);
+}).call(Demo.prototype);
 
 });
\ No newline at end of file
diff --git a/lib/ace/worker/WorkerClient.js b/lib/ace/worker/WorkerClient.js
index 00a633c6..dd18abea 100644
--- a/lib/ace/worker/WorkerClient.js
+++ b/lib/ace/worker/WorkerClient.js
@@ -11,31 +11,24 @@ define(function(require, exports, module) {
 var oop = require("pilot/oop");
 var EventEmitter = require("pilot/event_emitter").EventEmitter;
 
-var WorkerClient = function(baseUrl, topLevelNamespaces, module, clazz) {
+var WorkerClient = function(baseUrl, topLevelNamespaces, module, classname) {
     
+    this.callbacks = [];
     var workerUrl = require.nameToUrl("ace/worker/host", null, "_");
     var worker = this.$worker = new Worker(workerUrl);
     
-    //context = s.contexts[contextName],
-    //config = context.config;
-    //debugger;
-
-    console.log(require.nameToUrl("ace", null, "_"))
-    console.log(require.nameToUrl("pilot", null, "_"))
-    
     var tlns = {};
     for (var i=0; i<topLevelNamespaces.length; i++) {
         var ns = topLevelNamespaces[i];
         tlns[ns] = require.nameToUrl(ns, null, "_").replace(/.js$/, "").replace(require.config.baseUrl, "");
     }
-    console.log(tlns)
     
     this.$worker.postMessage({
         init : true,
         tlns: tlns,
         base: baseUrl,
         module: module,
-        clazz: clazz
+        classname: classname
     });
 
     this.callbackId = 1;
@@ -47,7 +40,6 @@ var WorkerClient = function(baseUrl, topLevelNamespaces, module, clazz) {
     };
     this.$worker.onmessage = function(e) {
         var msg = e.data;
-        //console.log("rec", msg)
         switch(msg.type) {
             case "log":
                 console.log(msg.data);
diff --git a/lib/ace/worker/host.js b/lib/ace/worker/host.js
index 0b1b3b80..791bf017 100644
--- a/lib/ace/worker/host.js
+++ b/lib/ace/worker/host.js
@@ -15,13 +15,9 @@ var require = function(name) {
     
     var chunks = name.split("/");
     chunks[0] = require.tlns[chunks[0]] || chunks[0];
-    name = chunks.join("/")
+    path = require.baseUrl + "/" + chunks.join("/") + ".js"
     
-    console.log(name)
-    console.log(require.baseUrl)
-    
-    console.log(require.baseUrl + "/" + name + ".js");
-    importScripts(require.baseUrl + "/" + name + ".js");
+    importScripts(path);
     return require.modules[name].exports;
 };
 require.modules = {};
@@ -50,9 +46,7 @@ function initSender() {
     var EventEmitter = require("pilot/event_emitter").EventEmitter;
     var oop = require("pilot/oop");
     
-    console.log("init sender")
-    
-    var Sender = function() {}
+    var Sender = function() {};
     
     (function() {
         
@@ -82,11 +76,10 @@ var main;
 var sender;
 
 onmessage = function(e) {
-    console.log(e.data)
     var msg = e.data;
     if (msg.command)
-        bgtokenizer[msg.command].apply(bgtokenizer, msg.args);
-    else if (msg.init) {
+        main[msg.command].apply(main, msg.args);
+    else if (msg.init) {        
         initBaseUrls(msg.base, msg.tlns);
         sender = initSender();
         var clazz = require(msg.module)[msg.classname];