Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'ErisDS/tag-default'

  • Loading branch information...
commit c375a386251e96da1f5f422ed3fca9b69962fd08 2 parents ab8ac50 + c961504
@jbt authored
Showing with 20 additions and 0 deletions.
  1. +15 −0 res/jsDoc.jst
  2. +5 −0 src/docker.js
View
15 res/jsDoc.jst
@@ -71,6 +71,21 @@ if(tags.length){
</span>
<% }
+ if(tag.type == 'unknown'){ %>
+ <div class="dox_tag_title"><%= tag.name %></div>
+ <div class="dox_tag_detail">
+<% if(tag.types){
+ for(var j = 0; j < tag.types.length; j += 1){ %>
+ <span class="dox_type"><%= tag.types[j] %></span>
+<% }
+ }
+
+ if(tag.description){ %>
+ <span><%= md(tag.description, true) %></span>
+<% } %>
+ </div>
+<% }
+
if(tag.type == 'see'){ %>
<div class="dox_tag_title">See</div>
<div class="dox_tag_detail">
View
5 src/docker.js
@@ -704,6 +704,11 @@ Docker.prototype.parseMultiline = function(comment){
tag.local = bits.join(' ');
}
break;
+ default:
+ if(bits[0].charAt(0) == '{') tag.types = grabType(bits).split(/ *[|,\/] */);
+ tag.description = bits.join(' ');
+ tag.name = tagType;
+ tag.type = 'unknown';
}
return tag;
Please sign in to comment.
Something went wrong with that request. Please try again.