Skip to content

Commit

Permalink
doc: prevent displaying empty version picker
Browse files Browse the repository at this point in the history
PR-URL: #15420
Fixes: #15396
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
  • Loading branch information
Chris Young authored and jasnell committed Sep 20, 2017
1 parent 5d217ad commit f0e411d
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 9 deletions.
11 changes: 11 additions & 0 deletions doc/api_assets/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,15 @@ em code {

#gtoc li {
display: inline;
border-right: 1px #000 solid;
margin-right: 0.4em;
padding-right: 0.4em;
}

#gtoc li:last-child {
border-right: none;
margin-right: 0;
padding-right: 0;
}

li.version-picker {
Expand Down Expand Up @@ -118,6 +127,8 @@ ol.version-picker {

#gtoc ol.version-picker li {
display: block;
border-right: 0;
margin-right: 0;
}

ol.version-picker li a {
Expand Down
11 changes: 4 additions & 7 deletions doc/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,15 @@ <h1>Node.js __VERSION__ Documentation</h1>
<div id="gtoc">
<ul>
<li>
<a href="index.html" name="toc">Index</a> |
<a href="index.html" name="toc">Index</a>
</li>
<li>
<a href="all.html">View on single page</a> |
<a href="all.html">View on single page</a>
</li>
<li>
<a href="__FILENAME__.json">View as JSON</a> |
</li>
<li class="version-picker">
<a href="#">View another version <span>&#x25bc;</span></a>
__ALTDOCS__
<a href="__FILENAME__.json">View as JSON</a>
</li>
__ALTDOCS__
</ul>
</div>
<hr>
Expand Down
12 changes: 10 additions & 2 deletions tools/doc/html.js
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,17 @@ function altDocs(filename) {
return html + '</a></li>';
}

const lis = (vs) => vs.filter(lte).map(li).join('\n');
const lis = versions.filter(lte).map(li).join('\n');

return `<ol class="version-picker">${lis(versions)}</ol>`;
if (!lis.length)
return '';

return `
<li class="version-picker">
<a href="#">View another version <span>&#x25bc;</span></a>
<ol class="version-picker">${lis}</ol>
</li>
`;
}

// handle general body-text replacements
Expand Down

0 comments on commit f0e411d

Please sign in to comment.