diff --git a/cli.js b/cli.js index 488dc8b3..c0f20ee2 100644 --- a/cli.js +++ b/cli.js @@ -315,8 +315,8 @@ cli.scanFiles = function() { if (env.conf.source && env.opts._.length) { filter = new Filter(env.conf.source); - env.sourceFiles = app.jsdoc.scanner.scan(env.opts._, (env.opts.recurse ? 10 : undefined), - filter); + env.sourceFiles = app.jsdoc.scanner.scan(env.opts._, + (env.opts.recurse ? env.conf.recurseDepth : undefined), filter); } return cli; diff --git a/lib/jsdoc/config.js b/lib/jsdoc/config.js index 333b7276..40df25b0 100644 --- a/lib/jsdoc/config.js +++ b/lib/jsdoc/config.js @@ -24,6 +24,12 @@ function mergeRecurse(target, source) { // required config values, override these defaults in your config.json if necessary var defaults = { + plugins: [], + recurseDepth: 10, + source: { + includePattern: '.+\\.js(doc|x)?$', + excludePattern: '' + }, tags: { allowUnknownTags: true, dictionaries: ['jsdoc', 'closure'] @@ -31,12 +37,7 @@ var defaults = { templates: { monospaceLinks: false, cleverLinks: false - }, - source: { - includePattern: '.+\\.js(doc|x)?$', - excludePattern: '' - }, - plugins: [] + } }; /** diff --git a/lib/jsdoc/tutorial/resolver.js b/lib/jsdoc/tutorial/resolver.js index 987843d4..8a38081d 100644 --- a/lib/jsdoc/tutorial/resolver.js +++ b/lib/jsdoc/tutorial/resolver.js @@ -100,7 +100,7 @@ exports.addTutorial = function(current) { exports.load = function(filepath) { var content; var current; - var files = fs.ls(filepath, env.opts.recurse ? 10 : undefined); + var files = fs.ls(filepath, env.opts.recurse ? env.conf.recurseDepth : undefined); var name; var match; var type;