jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #865 from ajaxorg/worker

Browse source 
fix for loading of files generated by r.js from the worker
This commit is contained in:
Lennart Kats 2012-08-13 04:10:27 -07:00
commit 718abf10a7
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/ace/worker/worker.js
View file

@ -35,8 +35,8 @@ var require = function(parentId, id) {
var module = require.modules[id]; var module = require.modules[id];
if (module) { if (module) {
if (!module.initialized) { if (!module.initialized) {
module.exports = module.factory().exports;
module.initialized = true; module.initialized = true;
module.exports = module.factory().exports;
} }
return module.exports; return module.exports;
} }
@ -56,6 +56,10 @@ require.tlns = {};
var define = function(id, deps, factory) { var define = function(id, deps, factory) {
if (arguments.length == 2) { if (arguments.length == 2) {
factory = deps; factory = deps;
if (typeof id != "string") {
deps = id;
id = require.id;
}
} else if (arguments.length == 1) { } else if (arguments.length == 1) {
factory = id; factory = id;
id = require.id; id = require.id;

2
lib/ace/worker/worker_client.js
View file

@ -114,6 +114,8 @@ var WorkerClient = function(topLevelNamespaces, mod, classname) {
oop.implement(this, EventEmitter); oop.implement(this, EventEmitter);
this.$normalizePath = function(path) { this.$normalizePath = function(path) {
if (!location.host) // needed for file:// protocol
return path;
path = path.replace(/^[a-z]+:\/\/[^\/]+/, ""); // Remove domain name and rebuild it path = path.replace(/^[a-z]+:\/\/[^\/]+/, ""); // Remove domain name and rebuild it
path = location.protocol + "//" + location.host path = location.protocol + "//" + location.host
// paths starting with a slash are relative to the root (host) // paths starting with a slash are relative to the root (host)