diff options
| author | Vlad Ureche <vlad.ureche@epfl.ch> | 2016-02-17 15:53:24 +0100 |
|---|---|---|
| committer | Vlad Ureche <vlad.ureche@epfl.ch> | 2016-02-17 15:53:24 +0100 |
| commit | 4e39a79e726eb2a499dd4948ef03e14b73f2e4e3 (patch) | |
| tree | 7600bb47ff5f0ce93b64f0a2432cbed66b1b6f0b | |
| parent | 0debcb4389865f31036c582c9f27bf0ac7b10c84 (diff) | |
| parent | 0c79fc1b89a0b5505025ffc7c8f45af8607a9bf3 (diff) | |
| download | scala-4e39a79e726eb2a499dd4948ef03e14b73f2e4e3.tar.gz scala-4e39a79e726eb2a499dd4948ef03e14b73f2e4e3.tar.bz2 scala-4e39a79e726eb2a499dd4948ef03e14b73f2e4e3.zip | |
Merge pull request #4972 from felixmulder/topic/scaladoc-package-member-filtering
Add package member filtering
| -rw-r--r-- | src/scaladoc/scala/tools/nsc/doc/html/page/Entity.scala | 40 |
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) |