diff options
| author | Pedro Furlanetto <pedrofurla@gmail.com> | 2010-10-07 20:22:40 +0000 |
|---|---|---|
| committer | Pedro Furlanetto <pedrofurla@gmail.com> | 2010-10-07 20:22:40 +0000 |
| commit | 68aafb29c162c117d87ef4786ee2226bd08663bc (patch) | |
| tree | 0e65b28627efe1d0a7cba8f2f874d33a7accc816 /src | |
| parent | eccc23e2e520c66aa72e229313efc33463df1eaa (diff) | |
| download | scala-68aafb29c162c117d87ef4786ee2226bd08663bc.tar.gz scala-68aafb29c162c117d87ef4786ee2226bd08663bc.tar.bz2 scala-68aafb29c162c117d87ef4786ee2226bd08663bc.zip | |
* Fix regression with `display packages only`:...
* Fix regression with `display packages only`: after clicking, templates were hidden and immediately shown again.
* Better handling of show/hide packages. Closes #3482.
* Removes authors from the docs.
review by dubochet.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/html/page/Template.scala | 8 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala index 362dcbe47d..622d2cdc22 100644 --- a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala +++ b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala @@ -339,14 +339,6 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage { </ol></div> else NodeSeq.Empty } - { if(!comment.authors.isEmpty && !isReduced) - <div class="block"><ol>authors - { val authors:List[scala.xml.NodeSeq]=for(body <- comment.authors) yield <li>{bodyToHtml(body)}</li> - authors.reduceLeft(_ ++ Text(", ") ++ _) - } - </ol></div> - else NodeSeq.Empty - } { if(!comment.see.isEmpty && !isReduced) <div class="block"><ol>see also: { val seeXml:List[scala.xml.NodeSeq]=(for(see <- comment.see ) yield <li>{bodyToHtml(see)}</li> ) diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js b/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js index 5c1d29fca6..6167fab297 100644 --- a/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js +++ b/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.js @@ -187,7 +187,7 @@ function textFilter() { matchedSet[child] ? 'show' : 'hide' ](); }); - $("> .templates", pack).show(); + if(kindFilterState=="all") $("> .templates", pack).show(); $("> .packhide", pack).show(); $("> .packfocus", pack).show(); }); @@ -206,7 +206,9 @@ function configureHideFilter() { packhide.text("show"); } else { - $("~ ol", packhide).show(); + // When the filter is in "packs" state, we don't want to show the `.templates`, only `.packages` + var selector = kindFilterState=="packs" ? "~ ol.packages" : "~ ol" + $(selector, packhide).show(); packhide.text("hide"); } return false; |