Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Some more fixes for metatags

  • Loading branch information...
commit 3f6e93a6193b4be548f080450bfef70c2e1b41bc 1 parent efa6317
@gjtorikian authored
View
2  lib/panino/plugins/parsers/javascript/jsd/doc_ast.js
@@ -337,7 +337,7 @@ function detect_enum(doc_map) {
// Combines "doc"-s of most tags
// Ignores tags that have doc comment themselves and subproperty tags
function detect_doc(docs, customTags) {
- var ignore_tags = _.union(["param", "return", "author", "version", "cancelable", "bubbles", "since"], customTags);
+ var ignore_tags = _.union(["param", "return", "author", "version", "cancelable", "bubbles", "since", "inherits"], customTags);
var doc_tags = _.filter(docs, function(tag) { return !_.include(ignore_tags, tag["tagname"]) && !subproperty(tag) });
return _.compact(_.map(doc_tags, function(tag) { return tag["doc"] })).join(" ");
}
View
5 lib/panino/plugins/parsers/javascript/jsd/doc_parser.js
@@ -75,7 +75,8 @@ function purify(input) {
}
else {
// Trim away indent if available
- result.push(line.replace(new RegExp("^\s{0," + (indent || 0) +"}", "")));
+ //result.push(line.replace(new RegExp("^\s{0," + indent + "}"), ""));
+ result.push(line.replace(/^\s+/,""));
}
});
@@ -188,7 +189,7 @@ function parse_loop(input, customTags) {
if (found) {
match(found);
add_tag(tagName);
- skip_white();
+ skip_horiz_white();
if (look(/.*/).length > 0)
current_tag["doc"] = strip(match(/.*/)); // no text means it's a boolean
View
3  lib/panino/plugins/parsers/jsd_parser.js
@@ -89,9 +89,6 @@ var process_jsd = function(source, file, options, callback) {
if (i["allowchild"] !== undefined)
nodes[classPrefix]["allowchild"] = i["allowchild"].doc;
- if (i["define"] !== undefined)
- nodes[classPrefix]["define"] = i["define"].doc;
-
return true;
}
});
View
2  package.json
@@ -1,6 +1,6 @@
{
"name" : "panino",
- "version" : "2.1.1",
+ "version" : "2.1.2",
"description" : "API documentation generator with a strict grammar and testing tools",
"keywords" : [
"api", "doc", "apidoc", "documentation", "pdoc", "ndoc", "jsduck", "jsdoc"
Please sign in to comment.
Something went wrong with that request. Please try again.