Skip to content

Commit 0c79fc1

Browse files
committed
Add package member filtering
Previously only entities like classes and traits would allow for filter of members. This commit removes that restriction by always including the `<div id="order">` in the entity template.
1 parent 0debcb4 commit 0c79fc1

File tree

1 file changed

+18
-22
lines changed

1 file changed

+18
-22
lines changed

src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -165,28 +165,24 @@ trait EntityPage extends HtmlPage {
165165
<div class='toggle'></div>
166166
<div id='memberfilter'><span class='input'><input id='mbrsel-input' placeholder='Filter members' type='text' accesskey='/'/></span><span class='clear'>✖</span></div>
167167
<div id='filterby'>
168-
{ if (tpl.linearizationTemplates.isEmpty && tpl.conversions.isEmpty && (!universe.settings.docGroups.value || (tpl.members.map(_.group).distinct.length == 1)))
169-
NodeSeq.Empty
170-
else
171-
<div id="order">
172-
<span class="filtertype">Ordering</span>
173-
<ol>
174-
{
175-
if (!universe.settings.docGroups.value || (tpl.members.map(_.group).distinct.length == 1))
176-
NodeSeq.Empty
177-
else
178-
<li class="group out"><span>Grouped</span></li>
179-
}
180-
<li class="alpha in"><span>Alphabetic</span></li>
181-
{
182-
if (tpl.linearizationTemplates.isEmpty && tpl.conversions.isEmpty)
183-
NodeSeq.Empty
184-
else
185-
<li class="inherit out"><span>By Inheritance</span></li>
186-
}
187-
</ol>
188-
</div>
189-
}
168+
<div id="order">
169+
<span class="filtertype">Ordering</span>
170+
<ol>
171+
{
172+
if (!universe.settings.docGroups.value || (tpl.members.map(_.group).distinct.length == 1))
173+
NodeSeq.Empty
174+
else
175+
<li class="group out"><span>Grouped</span></li>
176+
}
177+
<li class="alpha in"><span>Alphabetic</span></li>
178+
{
179+
if (tpl.linearizationTemplates.isEmpty && tpl.conversions.isEmpty)
180+
NodeSeq.Empty
181+
else
182+
<li class="inherit out"><span>By Inheritance</span></li>
183+
}
184+
</ol>
185+
</div>
190186
{ if (tpl.linearizationTemplates.isEmpty && tpl.conversions.isEmpty) NodeSeq.Empty else
191187
{
192188
if (!tpl.linearizationTemplates.isEmpty)

0 commit comments

Comments
 (0)