Skip to content
This repository was archived by the owner on Sep 1, 2020. It is now read-only.

Commit 6296e32

Browse files
committed
Actually fixes SI-5055. Scaladoc now a zillion times less annoying
1 parent 234390f commit 6296e32

File tree

1 file changed

+36
-16
lines changed
  • src/compiler/scala/tools/nsc/doc/html/resource/lib

1 file changed

+36
-16
lines changed

src/compiler/scala/tools/nsc/doc/html/resource/lib/template.js

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,37 @@ $(document).ready(function(){
2525
// Member filter box
2626
var input = $("#textfilter input");
2727
input.bind("keyup", function(event) {
28-
if (event.keyCode == 27)
29-
input.val(""); // escape key
30-
filter(true);
28+
29+
switch ( event.keyCode ) {
30+
31+
case 27: // escape key
32+
input.val("");
33+
filter(true);
34+
break;
35+
36+
case 38: // up
37+
input.val("");
38+
filter(false);
39+
window.scrollTo(0, $("body").offset().top);
40+
input.focus();
41+
break;
42+
43+
case 33: //page up
44+
input.val("");
45+
filter(false);
46+
break;
47+
48+
case 34: //page down
49+
input.val("");
50+
filter(false);
51+
break;
52+
53+
default:
54+
window.scrollTo(0, $("#mbrsel").offset().top);
55+
filter(true);
56+
break;
57+
58+
}
3159
});
3260
input.focus(function(event) {
3361
input.select();
@@ -37,18 +65,13 @@ $(document).ready(function(){
3765
filter();
3866
});
3967
$(document).keydown(function(event) {
40-
if(!event.altKey && !event.ctrlKey &&
41-
(event.keyCode == 27 || (event.keyCode >= 48 && event.keyCode <= 90)) &&
42-
document.activeElement != $("#textfilter input")[0]) {
43-
$("#textfilter input").focus();
44-
}
45-
if(event.keyCode == 9) {
68+
69+
if (event.keyCode == 9) { // tab
4670
$("#index-input", window.parent.document).focus();
4771
input.attr("value", "");
4872
return false;
49-
}
73+
}
5074
});
51-
$("#textfilter input").focus();
5275

5376
$("#linearization li").click(function(){
5477
if ($(this).hasClass("in")) {
@@ -256,7 +279,8 @@ function initInherit() {
256279
});
257280
};
258281

259-
function filter(scrollToMember) {
282+
/* filter used to take boolean scrollToMember */
283+
function filter() {
260284
var query = $.trim($("#textfilter input").val()).toLowerCase();
261285
query = query.replace(/[-[\]{}()*+?.,\\^$|#]/g, "\\$&").replace(/\s+/g, "|");
262286
var queryRegExp = new RegExp(query, "i");
@@ -332,10 +356,6 @@ function filter(scrollToMember) {
332356
members.hide();
333357
};
334358

335-
if (scrollToMember) {
336-
window.scrollTo(0, $("#mbrsel").offset().top);
337-
}
338-
339359
return false;
340360
};
341361

0 commit comments

Comments
 (0)