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

Moved options merging before query parameter parsing.

Browse Source
This commit is contained in:
Rafał Wrzeszcz 2011-12-10 23:10:08 +01:00
parent 03d9a9f16d
commit bcc5d5116e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jsdoc.js
View File

@ -155,10 +155,6 @@ function main() {
throw('Configuration file cannot be evaluated. '+e); throw('Configuration file cannot be evaluated. '+e);
} }
if (env.opts.query) {
env.opts.query = require('query').toObject(env.opts.query);
}
// allow to pass arguments from configuration file // allow to pass arguments from configuration file
if (env.conf.opts) { if (env.conf.opts) {
for (var opt in env.conf.opts) { for (var opt in env.conf.opts) {
@ -169,6 +165,10 @@ function main() {
} }
} }
if (env.opts.query) {
env.opts.query = require('query').toObject(env.opts.query);
}
// which version of javascript will be supported? (rhino only) // which version of javascript will be supported? (rhino only)
if (typeof version === 'function') { if (typeof version === 'function') {
version(env.conf.jsVersion || 180); version(env.conf.jsVersion || 180);