Permalink
Browse files

Merge branch 'narwhal-lib' of ../narwhal

  • Loading branch information...
2 parents cba1094 + 1f27b5a commit f182f2f0a952d75f06b0ebe142696056d2933501 @kriskowal committed May 23, 2010
Showing with 5 additions and 8 deletions.
  1. +5 −8 lib/narwhal/sandbox.js
View
@@ -29,9 +29,6 @@ exports.Sandbox = function (options) {
if (!options)
options = {};
- if (sandbox.debug)
- SYSTEM.print("REQUIRE: id["+id+"] baseId["+baseId+"] pkg["+pkg+"] basePkg["+basePkg+"]");
-
if (loader.resolvePkg) {
var resolveInfo = loader.resolvePkg(id, baseId, pkg, basePkg);
id = resolveInfo[0];
@@ -40,14 +37,11 @@ exports.Sandbox = function (options) {
id = loader.resolve(id, baseId);
}
- if (sandbox.debug)
- SYSTEM.print("USING: id["+id+"] pkg["+pkg+"]");
-
/* populate memo with module instance */
if (!Object.prototype.hasOwnProperty.call(exportsMemo, id) || options.force || options.once) {
if (sandbox.debug)
- SYSTEM.print(new Array(++debugDepth + 1).join("\\") + " " + id, 'module');
+ SYSTEM.print(new Array(++debugDepth + 1).join("\\") + " " + id);
var globals = {};
if (sandbox.debug) {
@@ -121,6 +115,9 @@ exports.Sandbox = function (options) {
}
}
+ if (sandbox.debug)
+ SYSTEM.print(factory.path);
+
if (sandbox.debug) {
// check for new globals
for (var name in global)
@@ -129,7 +126,7 @@ exports.Sandbox = function (options) {
}
if (sandbox.debug)
- SYSTEM.print(new Array(debugDepth-- + 1).join("/") + " " + id, 'module');
+ SYSTEM.print(new Array(debugDepth-- + 1).join("/") + " " + id);
// set fn.displayName on exported functions for better debugging
if (setDisplayName) {

0 comments on commit f182f2f

Please sign in to comment.