aboutsummaryrefslogtreecommitdiffstats
path: root/docs/src/ngdoc.js
diff options
context:
space:
mode:
authorIgor Minar2011-02-06 20:44:55 -0800
committerIgor Minar2011-02-07 23:55:02 -0800
commitf00b1578415ff45e5ce21de79e7bec00ab4dea51 (patch)
tree0aad7b208b19999afd04f735728679cfe18df95f /docs/src/ngdoc.js
parentae20f0c1b3f8ab30d3ede613cfe4ad32e3175ee9 (diff)
downloadangular.js-f00b1578415ff45e5ce21de79e7bec00ab4dea51.tar.bz2
@property should require type and description should be markdownified
Diffstat (limited to 'docs/src/ngdoc.js')
-rw-r--r--docs/src/ngdoc.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/src/ngdoc.js b/docs/src/ngdoc.js
index 18ea523b..153e6f90 100644
--- a/docs/src/ngdoc.js
+++ b/docs/src/ngdoc.js
@@ -157,14 +157,14 @@ Doc.prototype = {
} else if(atName == 'requires') {
self.requires.push(text);
} else if(atName == 'property') {
- var match = text.match(/^({(\S+)}\s*)?(\S+)(\s+(.*))?/);
+ var match = text.match(/^{(\S+)}\s+(\S+)(\s+(.*))?/);
if (!match) {
throw new Error("Not a valid 'property' format: " + text);
}
var property = {
- type: match[2],
- name: match[3],
- description: match[5] || ''
+ type: match[1],
+ name: match[2],
+ description: self.markdown(text.replace(match[0], match[4]))
};
self.properties.push(property);
} else {
@@ -445,7 +445,7 @@ Doc.prototype = {
});
dom.h('Properties', this.properties, function(property){
dom.h(property.name, function(){
- dom.text(property.description);
+ dom.html(property.description);
dom.h('Example', property.example, dom.html);
});
});