From 9a170dcd0348c3395e36efdd49a70db10d02707c Mon Sep 17 00:00:00 2001 From: Harutyun Amirjanyan Date: Mon, 27 May 2013 12:08:45 -0400 Subject: [PATCH] do not throw if require.toUrl is missing --- lib/ace/worker/worker_client.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/ace/worker/worker_client.js b/lib/ace/worker/worker_client.js index 6c849442..5a682fe5 100644 --- a/lib/ace/worker/worker_client.js +++ b/lib/ace/worker/worker_client.js @@ -41,14 +41,15 @@ var WorkerClient = function(topLevelNamespaces, mod, classname) { this.onMessage = this.onMessage.bind(this); this.onError = this.onError.bind(this); + // nameToUrl is renamed to toUrl in requirejs 2 + if (require.nameToUrl && !require.toUrl) + require.toUrl = require.nameToUrl; + var workerUrl; - if (config.get("packaged")) { + if (config.get("packaged") || !require.toUrl) { workerUrl = config.moduleUrl(mod, "worker"); } else { var normalizePath = this.$normalizePath; - // nameToUrl is renamed to toUrl in requirejs 2 - if (require.nameToUrl && !require.toUrl) - require.toUrl = require.nameToUrl; workerUrl = normalizePath(require.toUrl("ace/worker/worker.js", null, "_")); var tlns = {}; @@ -184,7 +185,7 @@ var UIWorkerClient = function(topLevelNamespaces, mod, classname) { var sender = Object.create(EventEmitter); var _self = this; - this.$worker = {} + this.$worker = {}; this.$worker.terminate = function() {}; this.$worker.postMessage = function(e) { _self.messageBuffer.push(e);