From e7b28b6dc2409f503eb9509e5f171256db18c33c Mon Sep 17 00:00:00 2001 From: Jeff Williams Date: Thu, 20 Sep 2012 08:50:18 -0700 Subject: [PATCH] move detectVm() so it isn't global --- jsdoc.js | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/jsdoc.js b/jsdoc.js index 69d1f7ec..b6f141e7 100644 --- a/jsdoc.js +++ b/jsdoc.js @@ -126,23 +126,6 @@ function exit(n) { java.lang.System.exit(n); } -/** - Detect the type of VM running jsdoc. - **Note**: Rhino is the only VM that is currently supported. - @return {string} rhino|node - */ -function detectVm() { - if (typeof Packages === "object" && - Object.prototype.toString.call(Packages) === "[object JavaPackage]") { - return "rhino"; - } else if ( require && require.main && module && (require.main === module) ) { - return "node"; - } else { - // unknown VM - return; - } -} - function installPlugins(plugins, p) { var dictionary = require('jsdoc/tag/dictionary'), parser = p || app.jsdoc.parser; @@ -217,6 +200,23 @@ function main() { fs = require('fs'), Config = require('jsdoc/config'); + /** + Detect the type of VM running jsdoc. + **Note**: Rhino is the only VM that is currently supported. + @return {string} rhino|node + */ + function detectVm() { + if (typeof Packages === "object" && + Object.prototype.toString.call(Packages) === "[object JavaPackage]") { + return "rhino"; + } else if ( require && require.main && module && (require.main === module) ) { + return "node"; + } else { + // unknown VM + return; + } + } + env.opts = jsdoc.opts.parser.parse(env.args); env.vm = detectVm();