Skip to content

Commit

Permalink
fix for #33: registered is a lifecycle method
Browse files Browse the repository at this point in the history
fix for #30, parse @default

bump dom5 to 1.0.3
  • Loading branch information
atotic authored and AJ Ortega committed May 26, 2015
1 parent e50a22e commit 8a4b1dc
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 6 deletions.
61 changes: 57 additions & 4 deletions hydrolysis.js

Large diffs are not rendered by default.

9 changes: 8 additions & 1 deletion lib/ast-utils/docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ var ELEMENT_CONFIGURATION = [
'observers',
'properties',
'ready',
'registered'
];

/** Tags understood by the annotation process, to be removed during `clean`. */
Expand Down Expand Up @@ -199,13 +200,19 @@ function annotateProperty(descriptor, ignoreConfiguration) {
descriptor.configuration = true;
}

// JSDoc wins.
// @type JSDoc wins
descriptor.type = jsdoc.getTag(descriptor.jsdoc, 'type', 'type') || descriptor.type;

if (descriptor.type.match(/^function/i)) {
_annotateFunctionProperty(descriptor);
}

// @default JSDoc wins
var defaultTag = jsdoc.getTag(descriptor.jsdoc, 'default');
if (defaultTag !== null) {
descriptor.default = (defaultTag.name || '') + (defaultTag.body || '');
}

return descriptor;
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"watch": "latest"
},
"dependencies": {
"dom5": "^1.0.1",
"dom5": "^1.0.3",
"es6-promise": "^2.1.0",
"espree": "^2.0.1",
"estraverse": "^3.1.0",
Expand Down

0 comments on commit 8a4b1dc

Please sign in to comment.