Skip to content

Commit

Permalink
fixed; options.locals support
Browse files Browse the repository at this point in the history
  • Loading branch information
aheckmann committed Apr 17, 2011
1 parent 15aa0b3 commit 3f4b4b3
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,13 @@ function resolve (options, callback, nested) {
}
}

if (!remaining.length) {
pending = remaining.length;
if (options.locals) ++pending;

if (!pending) {
return callback(null, options);
}

pending = remaining.length;

function error (err) {
if (error.ran) return;
callback(error.ran = err);
Expand All @@ -96,10 +97,8 @@ function resolve (options, callback, nested) {
if (nested) return;

// locals support
var locals = options.locals;
if (locals) {
++pending;
resolve(locals, function (err, resolved) {
if (options.locals) {
resolve(options.locals, function (err, resolved) {
if (err) return error(err);
options.locals = resolved;
--pending || callback(null, options);
Expand Down

0 comments on commit 3f4b4b3

Please sign in to comment.