fix worker loading for requirejs

lib/ace/mode/javascript.js

@@ -124,7 +124,7 @@ oop.inherits(Mode, TextMode);
     
     this.createWorker = function(session) {
         var doc = session.getDocument();
-        var worker = new WorkerClient("../..", ["ace", "pilot"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
+        var worker = new WorkerClient(["ace", "pilot"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
         worker.call("setValue", [doc.getValue()]);
         
         doc.on("change", function(e) {

lib/ace/mode/ruby.js

@@ -44,7 +44,6 @@ var Tokenizer = require("ace/tokenizer").Tokenizer;
 var RubyHighlightRules = require("ace/mode/ruby_highlight_rules").RubyHighlightRules;
 var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent;
 var Range = require("ace/range").Range;
-var WorkerClient = require("ace/worker/worker_client").WorkerClient;
 
 var Mode = function() {
     this.$tokenizer = new Tokenizer(new RubyHighlightRules().getRules());

lib/ace/worker/worker.js

@@ -19,7 +19,7 @@ var require = function(id) {
     
     var chunks = id.split("/");
     chunks[0] = require.tlns[chunks[0]] || chunks[0];
-    path = /*require.baseUrl + "/" +*/ chunks.join("/") + ".js";
+    path = chunks.join("/") + ".js";
     
     require.id = id;
 //    console.log("require " +  path + " " + id)
@@ -29,7 +29,6 @@ var require = function(id) {
 
 require.modules = {};
 require.tlns = {};
-require.baseUrl = "";
 
 var define = function(id, factory) {
     if (!factory) {
@@ -52,8 +51,7 @@ var define = function(id, factory) {
     };
 };
 
-function initBaseUrls(baseUrl, topLevelNamespaces) {
-    require.baseUrl = baseUrl;
+function initBaseUrls(topLevelNamespaces) {
     require.tlns = topLevelNamespaces;
 }
 
@@ -98,7 +96,7 @@ onmessage = function(e) {
         main[msg.command].apply(main, msg.args);
     }
     else if (msg.init) {        
-        initBaseUrls(msg.base, msg.tlns);
+        initBaseUrls(msg.tlns);
         require("pilot/fixoldbrowsers");
         sender = initSender();
         var clazz = require(msg.module)[msg.classname];

lib/ace/worker/worker_client.js

@@ -11,7 +11,7 @@ define(function(require, exports, module) {
 var oop = require("pilot/oop");
 var EventEmitter = require("pilot/event_emitter").EventEmitter;
 
-var WorkerClient = function(baseUrl, topLevelNamespaces, packagedJs, module, classname) {
+var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {
     
     this.callbacks = [];
     
@@ -25,14 +25,13 @@ var WorkerClient = function(baseUrl, topLevelNamespaces, packagedJs, module, cla
         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, "");
+            tlns[ns] = require.nameToUrl(ns, null, "_").replace(/.js$/, "");
         }
     }
     
     this.$worker.postMessage({
         init : true,
         tlns: tlns,
-        base: baseUrl,
         module: module,
         classname: classname
     });