archive-gh-me/jsdoc
1
0
Fork 0
mirror of https://github.com/jsdoc/jsdoc.git synced 2025-12-08 19:46:11 +00:00
Code Issues Projects Releases Wiki Activity

Runtime '_' is concatenated with conf one.

Browse Source
This commit is contained in:
Tomek Wytrębowicz 2012-01-26 21:59:08 +01:00
parent 9311f138c0
commit 96fd06860b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jsdoc.js
View File

@ -160,10 +160,14 @@ function main() {
if (env.conf.opts) {
for (var opt in env.conf.opts) {
// arguments passed in command are more important
if (!(opt in env.opts) || opt=='_' && env.opts['_'] && env.opts['_'].length<1) {
if (!(opt in env.opts)) {
env.opts[opt] = env.conf.opts[opt];
}
}
// command file list is concatenated after conf list
if( env.conf.opts._ ){
env.opts._ = env.conf.opts._.concat( env.opts._ );
}
}
if (env.opts.query) {