diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-04 19:43:01 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-04 19:43:01 -0800 |
commit | 893fad496965744f6e6fbfa4b5a0add3c5eff9fa (patch) | |
tree | c783d0f6aacbbf0a306d178e81e2048e37b43196 /src/compiler | |
parent | d35ccc3c55e04130e12ed8acd31fd418cb84db95 (diff) | |
parent | 0e8d8c735e9a4590d3f74b549b8453f46335709a (diff) | |
download | scala-893fad496965744f6e6fbfa4b5a0add3c5eff9fa.tar.gz scala-893fad496965744f6e6fbfa4b5a0add3c5eff9fa.tar.bz2 scala-893fad496965744f6e6fbfa4b5a0add3c5eff9fa.zip |
Merge pull request #2050 from kzys/jira-6017-v2
SI-6017 Scaladoc: Fix dangling links on index.html
Diffstat (limited to 'src/compiler')
3 files changed, 25 insertions, 20 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/html/page/Index.scala b/src/compiler/scala/tools/nsc/doc/html/page/Index.scala index 86407fb9a3..c76bdc58d9 100644 --- a/src/compiler/scala/tools/nsc/doc/html/page/Index.scala +++ b/src/compiler/scala/tools/nsc/doc/html/page/Index.scala @@ -48,10 +48,28 @@ class Index(universe: doc.Universe, val index: doc.Index) extends HtmlPage { </div> </body> + def letters: NodeSeq = + '_' +: ('a' to 'z') map { + char => { + val label = if (char == '_') '#' else char.toUpper + + index.firstLetterIndex.get(char) match { + case Some(_) => + <a target="template" href={ "index/index-" + char + ".html" }>{ + label + }</a> + case None => <span>{ label }</span> + } + } + } + def browser = <div id="browser" class="ui-layout-west"> <div class="ui-west-center"> - <div id="filter"></div> + <div id="filter"> + <div id="textfilter"></div> + <div id="letters">{ letters }</div> + </div> <div class="pack" id="tpl">{ def packageElem(pack: model.Package): NodeSeq = { <xml:group> diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.css b/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.css index 2a8f9b570a..55fb370a41 100644 --- a/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.css +++ b/src/compiler/scala/tools/nsc/doc/html/resource/lib/index.css @@ -206,7 +206,7 @@ h1 { border-right:0; } -#letters > a { +#letters > a, #letters > span { /* font-family: monospace;*/ color: #858484; font-weight: bold; @@ -214,6 +214,10 @@ h1 { text-shadow: #ffffff 0 1px 0; padding-right: 2px; } + +#letters > span { + color: #bbb; +} #tpl { display: block; 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 1323a06c01..70073b272a 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 @@ -335,8 +335,7 @@ function keyboardScrolldownLeftPane() { /* Configures the text filter */ function configureTextFilter() { scheduler.add("init", function() { - $("#filter").append("<div id='textfilter'><span class='pre'/><span class='input'><input id='index-input' type='text' accesskey='/'/></span><span class='post'/></div>"); - printAlphabet(); + $("#textfilter").append("<span class='pre'/><span class='input'><input id='index-input' type='text' accesskey='/'/></span><span class='post'/>"); var input = $("#textfilter input"); resizeFilterBlock(); input.bind('keyup', function(event) { @@ -532,19 +531,3 @@ function kindFilterSync() { function resizeFilterBlock() { $("#tpl").css("top", $("#filter").outerHeight(true)); } - -function printAlphabet() { - var html = '<a target="template" href="index/index-_.html">#</a>'; - var c; - for (c = 'a'; c <= 'z'; c = String.fromCharCode(c.charCodeAt(0) + 1)) { - html += [ - '<a target="template" href="index/index-', - c, - '.html">', - c.toUpperCase(), - '</a>' - ].join(''); - } - $("#filter").append('<div id="letters">' + html + '</div>'); -} - |