diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-08-29 04:13:40 -0700 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-08-29 04:13:40 -0700 |
| commit | 0ba1db06f5fa9f16a4cb4d9d7a62cf1eb83bd359 (patch) | |
| tree | 30af7bc133bb0953e573a9f8bc131ccf735f907f | |
| parent | 3313b3049c810909465d5ae60664852610e6834c (diff) | |
| parent | 51b7be2fefa2b39ab404df510e5e793944d12fa1 (diff) | |
| download | scala-0ba1db06f5fa9f16a4cb4d9d7a62cf1eb83bd359.tar.gz scala-0ba1db06f5fa9f16a4cb4d9d7a62cf1eb83bd359.tar.bz2 scala-0ba1db06f5fa9f16a4cb4d9d7a62cf1eb83bd359.zip | |
Merge pull request #1193 from VladUreche/issue/scaladoc-anchor
SI-6280 Scaladoc: Reloading preserves anchors
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/html/page/Template.scala | 6 |
1 files changed, 5 insertions, 1 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 1f68781777..24a26b2ad3 100644 --- a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala +++ b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala @@ -49,7 +49,11 @@ class Template(universe: doc.Universe, generator: DiagramGenerator, tpl: DocTemp if(top === self) {{ var url = '{ val p = templateToPath(tpl); "../" * (p.size - 1) + "index.html" }'; var hash = '{ val p = templateToPath(tpl); (p.tail.reverse ::: List(p.head.replace(".html", ""))).mkString(".") }'; - window.location.href = url + '#' + hash; + var anchor = window.location.hash; + var anchor_opt = ''; + if (anchor.length { scala.xml.Unparsed(">=") /* unless we use Unparsed, it gets escaped and crashes the script */ } 1) + anchor_opt = '@' + anchor.substring(1); + window.location.href = url + '#' + hash + anchor_opt; }} </script> </xml:group> |