aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorIgor Minar2010-11-03 09:40:26 -0700
committerIgor Minar2010-11-03 09:47:23 -0700
commita8efd43d256e67b954a38eb20438714815442f29 (patch)
tree722c980d2afb32224fb4961272c7a3ee6705f08e /docs
parent96abeb1074ec59ddb727ea8164aa770d972c4a9a (diff)
downloadangular.js-a8efd43d256e67b954a38eb20438714815442f29.tar.bz2
doc parser should recognize the 'defaults' syntax for params
Diffstat (limited to 'docs')
-rw-r--r--docs/collect.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/collect.js b/docs/collect.js
index a7a22a09..f85f2c6b 100644
--- a/docs/collect.js
+++ b/docs/collect.js
@@ -113,13 +113,13 @@ var TAG = {
param: function(doc, name, value){
doc.param = doc.param || [];
doc.paramRest = doc.paramRest || [];
- var match = value.match(/^({([^\s=]+)(=([^\s]+))?}\s*)?([^\s]+)\s*(.*)/);
+ var match = value.match(/^({([^\s=]+)(=)?}\s*)?([^\s]+|\[(\S+)+=([^\]]+)\])\s+(.*)/);
if (match) {
var param = {
type: match[2],
- 'default':match[4],
- name: match[5],
- description:match[6]};
+ name: match[4] || match[5],
+ 'default':match[6],
+ description:match[7]};
doc.param.push(param);
if (!doc.paramFirst) {
doc.paramFirst = param;