From 0c79fc1b89a0b5505025ffc7c8f45af8607a9bf3 Mon Sep 17 00:00:00 2001
From: Felix Mulder <felix.mulder@gmail.com>
Date: Wed, 17 Feb 2016 14:12:19 +0100
Subject: 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.
---
 .../scala/tools/nsc/doc/html/page/Entity.scala     | 40 ++++++++++------------
 1 file 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)
-- 
cgit v1.2.3