diff --git a/rhino_modules/jsdoc/src/handlers.js b/rhino_modules/jsdoc/src/handlers.js index e53064ae..2410f784 100644 --- a/rhino_modules/jsdoc/src/handlers.js +++ b/rhino_modules/jsdoc/src/handlers.js @@ -25,6 +25,8 @@ exports.attachTo = function(parser) { currentModule = newDoclet.longname; } e.doclet = newDoclet; + + resolveProperties(newDoclet); }); // handles named symbols in the code, may or may not have a JSDoc comment attached @@ -117,16 +119,7 @@ exports.attachTo = function(parser) { return false; } - // find name and description from each property tag text - if (newDoclet.properties) { - for (var i = 0, len = newDoclet.properties.length; i < len; i++) { - var property = newDoclet.properties[i]; - - var parts = jsdoc.name.splitName(property.description); - property.name = parts.name; - property.description = parts.description; - } - } + resolveProperties(newDoclet); if (!newDoclet.memberof) { newDoclet.scope = 'global'; @@ -163,5 +156,18 @@ exports.attachTo = function(parser) { return false; } + + function resolveProperties(newDoclet) { + // find name and description from each property tag text + if (newDoclet.properties) { + for (var i = 0, len = newDoclet.properties.length; i < len; i++) { + var property = newDoclet.properties[i]; + + var parts = jsdoc.name.splitName(property.description); + property.name = parts.name; + property.description = parts.description; + } + } + } } diff --git a/rhino_modules/jsdoc/src/parser.js b/rhino_modules/jsdoc/src/parser.js index 0cc74198..091e938f 100644 --- a/rhino_modules/jsdoc/src/parser.js +++ b/rhino_modules/jsdoc/src/parser.js @@ -429,7 +429,6 @@ function aboutNode(node) { if (node.type == Token.FUNCTION) { about.name = '' + node.name; - about.type = 'function'; about.node = node; }