arg/scriptcraft
Archived
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Undoing merge of PR #278

Browse source
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() ) { if ( file.exists() ) {
return fileExists(file); return fileExists(file);
} else { } else {
if ((file = new File(parentDir, moduleName)).exists()) { // try appending a .js to the end
return fileExists(file); pathWithJSExt = file.canonicalPath + '.js';
} else if ((file = new File(parentDir, moduleName + ".js")).exists()) { // try .js extension file = new File( parentDir, pathWithJSExt );
return file; if (file.exists()) {
} else if ((file = new File(parentDir, moduleName + ".json")).exists()) { // try .json extension return file;
return file; } else {
file = new File(pathWithJSExt);
if ( file.exists() ) {
return file;
}
}
} }
} }
return null; 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 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 = { moduleInfo = {
loaded: false, loaded: false,
id: canonizedFilename, id: canonizedFilename,