daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The return of relative module loading

v0.7.4-release
Felix Geisendörfer 2009-11-02 21:21:02 +01:00 committed by Ryan Dahl
parent 7069bee982
commit 43d651daef
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/node.js
View File

@ -342,7 +342,7 @@ function loadModule (request, parent) {
debug("loadModule REQUEST " + JSON.stringify(request) + " parent: " + JSON.stringify(parent));
var id, paths;
if (request.charAt(0) == "." && request.charAt(1) == "/") {
if (request.charAt(0) == "." && (request.charAt(1) == "/" || request.charAt(1) == ".")) {
// Relative request
id = path.join(path.dirname(parent.id), request);
paths = [path.dirname(parent.filename)];

6
test/mjsunit/test-module-loading.js
View File

@ -5,7 +5,10 @@ debug("load test-module-loading.js");
var a = require("./fixtures/a");
var d = require("./fixtures/b/d");
var d2 = require("./fixtures/b/d");
// Absolute
var d3 = require(require('path').dirname(__filename)+"/fixtures/b/d");
// Relative
var d4 = require("../mjsunit/fixtures/b/d");
assertFalse(false, "testing the test program.");
@ -27,6 +30,9 @@ assertEquals("D", d2.D());
assertInstanceof(d3.D, Function);
assertEquals("D", d3.D());
assertInstanceof(d4.D, Function);
assertEquals("D", d4.D());
process.addListener("exit", function () {
assertInstanceof(a.A, Function);
assertEquals("A done", a.A());