diff options
author | Heather Miller <heather.miller@epfl.ch> | 2012-05-19 16:16:34 +0200 |
---|---|---|
committer | Heather Miller <heather.miller@epfl.ch> | 2012-05-19 16:16:34 +0200 |
commit | 6296e324485f1d457e561824a3a8ddcafc3a08d8 (patch) | |
tree | 08570b93bc0b45443e503f55d8cd4cff479fc501 /src | |
parent | 234390f654c82769f677479221ba9a2c8bbba265 (diff) | |
download | scala-6296e324485f1d457e561824a3a8ddcafc3a08d8.tar.gz scala-6296e324485f1d457e561824a3a8ddcafc3a08d8.tar.bz2 scala-6296e324485f1d457e561824a3a8ddcafc3a08d8.zip |
Actually fixes SI-5055. Scaladoc now a zillion times less annoying
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/doc/html/resource/lib/template.js | 52 |
1 files changed, 36 insertions, 16 deletions
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 96d6398810..33fbd83bee 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 @@ -25,9 +25,37 @@ $(document).ready(function(){ // Member filter box var input = $("#textfilter input"); input.bind("keyup", function(event) { - if (event.keyCode == 27) - input.val(""); // escape key - filter(true); + + switch ( event.keyCode ) { + + case 27: // escape key + input.val(""); + filter(true); + break; + + case 38: // up + input.val(""); + filter(false); + window.scrollTo(0, $("body").offset().top); + input.focus(); + break; + + case 33: //page up + input.val(""); + filter(false); + break; + + case 34: //page down + input.val(""); + filter(false); + break; + + default: + window.scrollTo(0, $("#mbrsel").offset().top); + filter(true); + break; + + } }); input.focus(function(event) { input.select(); @@ -37,18 +65,13 @@ $(document).ready(function(){ filter(); }); $(document).keydown(function(event) { - if(!event.altKey && !event.ctrlKey && - (event.keyCode == 27 || (event.keyCode >= 48 && event.keyCode <= 90)) && - document.activeElement != $("#textfilter input")[0]) { - $("#textfilter input").focus(); - } - if(event.keyCode == 9) { + + if (event.keyCode == 9) { // tab $("#index-input", window.parent.document).focus(); input.attr("value", ""); return false; - } + } }); - $("#textfilter input").focus(); $("#linearization li").click(function(){ if ($(this).hasClass("in")) { @@ -256,7 +279,8 @@ function initInherit() { }); }; -function filter(scrollToMember) { +/* filter used to take boolean scrollToMember */ +function filter() { var query = $.trim($("#textfilter input").val()).toLowerCase(); query = query.replace(/[-[\]{}()*+?.,\\^$|#]/g, "\\$&").replace(/\s+/g, "|"); var queryRegExp = new RegExp(query, "i"); @@ -332,10 +356,6 @@ function filter(scrollToMember) { members.hide(); }; - if (scrollToMember) { - window.scrollTo(0, $("#mbrsel").offset().top); - } - return false; }; |