arg
/
scriptcraft
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Undoing merge of PR #278

This commit is contained in:
walterhiggins 2016-01-01 12:55:53 +00:00
parent eef507fdfe
commit badf8b5470
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/js/lib/require.js
View File

@ -165,12 +165,18 @@ When resolving module names to file paths, ScriptCraft uses the following rules.
if ( file.exists() ) {
return fileExists(file);
} else {
if ((file = new File(parentDir, moduleName)).exists()) {
return fileExists(file);
} else if ((file = new File(parentDir, moduleName + ".js")).exists()) { // try .js extension
return file;
} else if ((file = new File(parentDir, moduleName + ".json")).exists()) { // try .json extension
return file;
// try appending a .js to the end
pathWithJSExt = file.canonicalPath + '.js';
file = new File( parentDir, pathWithJSExt );
if (file.exists()) {
return file;
} else {
file = new File(pathWithJSExt);
if ( file.exists() ) {
return file;
}
}
}
}
return null;
@ -244,9 +250,6 @@ When resolving module names to file paths, ScriptCraft uses the following rules.
}
buffered.close(); // close the stream so there's no file locks
if(canonizedFilename.substring(canonizedFilename.length - 5) === ".json") // patch code when it is json
code = "module.exports = (" + code + ");";
moduleInfo = {
loaded: false,
id: canonizedFilename,