From b2554cab41d29c62beaf88e74e1d1be72e958518 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Thu, 15 May 2014 16:58:13 +0200 Subject: [PATCH] Mark optional and repeatable arguments --- apidoc/template/static/styles/jaguar.css | 2 +- apidoc/template/tmpl/params.tmpl | 24 +++++++----------------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/apidoc/template/static/styles/jaguar.css b/apidoc/template/static/styles/jaguar.css index 33362bb382..48cff0a1b7 100644 --- a/apidoc/template/static/styles/jaguar.css +++ b/apidoc/template/static/styles/jaguar.css @@ -294,7 +294,7 @@ li { .main table .description p { margin: 0; } -.main table .optional { +.main table .optional, .main table .repeatable { float: left; border-radius: 3px; background-color: #ddd!important; diff --git a/apidoc/template/tmpl/params.tmpl b/apidoc/template/tmpl/params.tmpl index 756b30f256..59a04199e5 100644 --- a/apidoc/template/tmpl/params.tmpl +++ b/apidoc/template/tmpl/params.tmpl @@ -24,9 +24,15 @@ var colspan = 2; params.forEach(function(param) { if (!param) { return; } + if (param.type && param.type.names && param.type.names.indexOf('undefined') !== -1) { + param.optional = true; + } + if (param.name.indexOf('var_') == 0) { + params.hasAttributes = true; + param.variable = true; + } if (param.optional || param.nullable) { - ++colspan; params.hasAttributes = true; } @@ -50,10 +56,6 @@ Type - - Argument - - Default @@ -81,18 +83,6 @@ - - - - <optional>
- - - - <nullable>
- - - -