summaryrefslogtreecommitdiff
path: root/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala
diff options
context:
space:
mode:
authorFelix Mulder <felix.mulder@gmail.com>2016-02-17 14:12:19 +0100
committerFelix Mulder <felix.mulder@gmail.com>2016-02-17 14:12:19 +0100
commit0c79fc1b89a0b5505025ffc7c8f45af8607a9bf3 (patch)
tree7600bb47ff5f0ce93b64f0a2432cbed66b1b6f0b /src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala
parent0debcb4389865f31036c582c9f27bf0ac7b10c84 (diff)
downloadscala-0c79fc1b89a0b5505025ffc7c8f45af8607a9bf3.tar.gz
scala-0c79fc1b89a0b5505025ffc7c8f45af8607a9bf3.tar.bz2
scala-0c79fc1b89a0b5505025ffc7c8f45af8607a9bf3.zip
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.
Diffstat (limited to 'src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala')
-rw-r--r--src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala40
1 files changed, 18 insertions, 22 deletions
diff --git a/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala b/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala
index 503d54185a..556cc0a5a3 100644
--- a/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala
@@ -165,28 +165,24 @@ trait EntityPage extends HtmlPage {
<div class='toggle'></div>
<div id='memberfilter'><span class='input'><input id='mbrsel-input' placeholder='Filter members' type='text' accesskey='/'/></span><span class='clear'>✖</span></div>
<div id='filterby'>
- { if (tpl.linearizationTemplates.isEmpty && tpl.conversions.isEmpty && (!universe.settings.docGroups.value || (tpl.members.map(_.group).distinct.length == 1)))
- NodeSeq.Empty
- else
- <div id="order">
- <span class="filtertype">Ordering</span>
- <ol>
- {
- if (!universe.settings.docGroups.value || (tpl.members.map(_.group).distinct.length == 1))
- NodeSeq.Empty
- else
- <li class="group out"><span>Grouped</span></li>
- }
- <li class="alpha in"><span>Alphabetic</span></li>
- {
- if (tpl.linearizationTemplates.isEmpty && tpl.conversions.isEmpty)
- NodeSeq.Empty
- else
- <li class="inherit out"><span>By Inheritance</span></li>
- }
- </ol>
- </div>
- }
+ <div id="order">
+ <span class="filtertype">Ordering</span>
+ <ol>
+ {
+ if (!universe.settings.docGroups.value || (tpl.members.map(_.group).distinct.length == 1))
+ NodeSeq.Empty
+ else
+ <li class="group out"><span>Grouped</span></li>
+ }
+ <li class="alpha in"><span>Alphabetic</span></li>
+ {
+ if (tpl.linearizationTemplates.isEmpty && tpl.conversions.isEmpty)
+ NodeSeq.Empty
+ else
+ <li class="inherit out"><span>By Inheritance</span></li>
+ }
+ </ol>
+ </div>
{ if (tpl.linearizationTemplates.isEmpty && tpl.conversions.isEmpty) NodeSeq.Empty else
{
if (!tpl.linearizationTemplates.isEmpty)