Skip to content

Commit

Permalink
issue matthewfl#2 fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewfl committed Dec 4, 2010
1 parent 99ef6ca commit cbfa00d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
5 changes: 3 additions & 2 deletions sandbox/boxed.js
Expand Up @@ -20,9 +20,10 @@ __filename="main.js";
var fn = eval("(function (exports, __server, __loop_check_, require, __get_code, __process_compile, __process_exit, debug) {\n " + code + " \n return exports;\n})"); var fn = eval("(function (exports, __server, __loop_check_, require, __get_code, __process_compile, __process_exit, debug) {\n " + code + " \n return exports;\n})");
modules[name]=(function () { return {} })(); modules[name]=(function () { return {} })();
return fn.apply(modules[name], [modules[name], __server, loop_check, global.require, __get_code, __process_compile, __process_exit, debug]); return fn.apply(modules[name], [modules[name], __server, loop_check, global.require, __get_code, __process_compile, __process_exit, debug]);
//if(modules[name].fail) throw name + " is not to be required in";
return modules[name]; return modules[name];
}else { }else if(typeof code == "undefined") {
throw "module "+name+" was not found";
}else{
return modules[name] = code; return modules[name] = code;
} }
}; };
Expand Down
6 changes: 3 additions & 3 deletions sandbox/build.js
Expand Up @@ -6,7 +6,7 @@ exports.build = function (code, user, back) {
var ret={}; var ret={};
var need={}; var need={};
ret._=jsmin("", code, 1); ret._=jsmin("", code, 1);
code.replace(/require\s*?\((.*)\)/g, function (r, v) { code.replace(/require\s*?\((.*?)\)/g, function (r, v) {
try { try {
console.log(v); console.log(v);
need[v.replace(/\"(.*)\"|\'(.*)\'/, function (r) { return r.substring(1,r.length-1); })]=true; need[v.replace(/\"(.*)\"|\'(.*)\'/, function (r) { return r.substring(1,r.length-1); })]=true;
Expand All @@ -22,11 +22,11 @@ exports.build = function (code, user, back) {
count++; count++;
(function (name) { (function (name) {
db.get("fs_"+user+"_"+name.substring(2), function (code) { db.get("fs_"+user+"_"+name.substring(2), function (code) {
ret[name] = code || "throw 'not found';"; ret[name] = code ? jsmin("",code,1) : "throw 'not found';";
if(!--count) back(ret); if(!--count) back(ret);
}); });
})(name); })(name);
}else if(modules[name]) {} }else if(typeof modules[name] != "undefined") {}
else if(name.indexOf('/')) { else if(name.indexOf('/')) {
// will be used latter // will be used latter
}else }else
Expand Down
3 changes: 2 additions & 1 deletion sandbox/modules.js
Expand Up @@ -58,6 +58,7 @@ exports.db = exports.database = function (context, config) {
db = db || require('../db'); db = db || require('../db');
var baseName = "db_"+config.user+"_"+config.name+"_"; var baseName = "db_"+config.user+"_"+config.name+"_";
var tmp={}; var tmp={};
console.log(config);
return { return {
get: function (name, back) { get: function (name, back) {
if(config.test && tmp[name]) back(tmp[name]); if(config.test && tmp[name]) back(tmp[name]);
Expand Down Expand Up @@ -94,7 +95,7 @@ exports.fs = function (context, config) {
throw "The filesystem supports no modifications of the file system from the application"; throw "The filesystem supports no modifications of the file system from the application";
} }
function noSync () { function noSync () {
throw "The file system supports not synchronous calls"; throw "The file system does not supports synchronous calls";
} }
return { return {
unlink: noMod, unlink: noMod,
Expand Down

0 comments on commit cbfa00d

Please sign in to comment.