From 572e28efa2e3cde78b5e7984b7760fd4c270f619 Mon Sep 17 00:00:00 2001 From: Myles Borins Date: Tue, 10 May 2016 11:56:56 -0700 Subject: tools: fix regression in doctool 101dd1e introduced a regression in the doctool. This commit reverts the changes that were made to the function signature of the various doctool functions while maintaining support for passing in specific node versions. Refs: https://github.com/nodejs/node/commit/101dd1e PR-URL: https://github.com/nodejs/node/pull/6680 Reviewed-By: Jeremiah Senkpiel Reviewed-By: Robert Lindstaedt --- tools/doc/generate.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'tools/doc/generate.js') diff --git a/tools/doc/generate.js b/tools/doc/generate.js index 94c0905468..7df987e1cf 100644 --- a/tools/doc/generate.js +++ b/tools/doc/generate.js @@ -24,6 +24,8 @@ args.forEach(function(arg) { } }); +nodeVersion = nodeVersion || process.version; + if (!inputFile) { throw new Error('No input file specified'); } @@ -46,15 +48,11 @@ function next(er, input) { break; case 'html': - require('./html.js')({ - input: input, - filename: inputFile, - template: template, - nodeVersion: nodeVersion, - }, function(er, html) { - if (er) throw er; - console.log(html); - }); + require('./html.js')(input, inputFile, template, nodeVersion, + function(er, html) { + if (er) throw er; + console.log(html); + }); break; default: -- cgit v1.2.3