summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2010-07-15 14:13:03 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2010-07-15 14:13:03 +0000
commitd93ab70b4769280827d1e772b82022ef43105f0c (patch)
tree1e43b0dfd166e2fcc253c032eed31a3a3ce5e463 /src
parent0661398cebda25f3a775e1b2e356125859e2b37c (diff)
downloadscala-d93ab70b4769280827d1e772b82022ef43105f0c.tar.gz
scala-d93ab70b4769280827d1e772b82022ef43105f0c.tar.bz2
scala-d93ab70b4769280827d1e772b82022ef43105f0c.zip
[scaladoc] Full comments with "by inheritance" ...
[scaladoc] Full comments with "by inheritance" ordering are correctly displayed. No review.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css5
-rw-r--r--src/compiler/scala/tools/nsc/doc/html/resource/lib/template.js4
2 files changed, 3 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css b/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css
index 8399a6abe8..4ef29bf0cc 100644
--- a/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css
+++ b/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.css
@@ -317,11 +317,8 @@ div.fullcomment {
margin: 10px 0 10px 0;
}
-#types div.fullcomment, #values div.fullcomment {
- display:none
-}
-
#template div.fullcomment {
+ display:none;
margin: 6px 0 6px 8.7em;
}
diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.js b/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.js
index 6f01e56ddc..506edd7746 100644
--- a/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.js
+++ b/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.js
@@ -93,6 +93,7 @@ $(document).ready(function(){
orderInherit();
};
});
+ initInherit();
//http://flowplayer.org/tools/tooltip.html
$(".extype").tooltip({
tip: "#tooltip",
@@ -114,7 +115,7 @@ $(document).ready(function(){
var docShowSigs = docAllSigs.filter(function(){
return $("+ div.fullcomment", $(this)).length > 0;
});
- docShowSigs.css("cursor", "pointer");
+ docShowSigs.css("cursor", "pointer");
docShowSigs.click(function(){
commentShowFct($("+ div.fullcomment", $(this)));
});
@@ -140,7 +141,6 @@ $(document).ready(function(){
$("p.shortcomment").click(function(){
commentToggleFct($(this));
});
- initInherit();
});
function orderAlpha() {