archive-gh-me/documentation
1
0
Fork 0
mirror of https://github.com/documentationjs/documentation.git synced 2026-01-25 14:26:29 +00:00
Code Issues Projects Releases Wiki Activity

Prevent double call to require when theme is set + jsdoc fixes (#411)

Browse Source 
- Updates html.js to not double call require when theme is set.
- Normalizes jsdoc comments.
This commit is contained in:
Ans 2016-05-02 13:16:34 -04:00 committed by Tom MacWright
parent 3da1ff6dd0
commit dd0aca93e6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/output/html.js
View File

@ -5,18 +5,20 @@ var path = require('path');
/**
* Formats documentation as HTML.
*
* @param {Array<Object>} comments parsed comments
* @param {Array<Object>} comments Parsed comments.
* @param {Object} options Options that can customize the output
* @param {string} [options.theme='documentation-theme-default'] Name of a module used for an HTML theme.
* @param {Function} callback called with array of results as vinyl-fs objects
* @returns {undefined} calls callback
* @param {Function} callback Called with array of results as vinyl-fs objects.
* @returns {undefined} Calls callback.
* @name html
*/
module.exports = function makeHTML(comments, options, callback) {
options = options || {};
var theme = require('documentation-theme-default');
var theme;
if (options.theme) {
theme = require(path.resolve(process.cwd(), options.theme));
} else {
theme = require('documentation-theme-default');
}
theme(comments, options, callback);
};