Skip to content

Commit 0cd459f

Browse files
committed
Auto merge of #80554 - GuillaumeGomez:more-js-cleanup, r=jyn514
More js cleanup Part of #79052 (Same kind as #80515). This one is about some small fixes: * Replacing some loops with `onEachLazy`. * Removing unused function arguments. * Turn `buildHelperPopup` into a variable so it can be "replaced" once the function has been called once so it's not called again. r? `@jyn514`
2 parents 8989689 + 8b6304e commit 0cd459f

File tree

1 file changed

+12
-18
lines changed

1 file changed

+12
-18
lines changed

Diff for: src/librustdoc/html/static/main.js

+12-18
Original file line numberDiff line numberDiff line change
@@ -493,11 +493,7 @@ function defocusSearchBar() {
493493
document.addEventListener("keypress", handleShortcut);
494494
document.addEventListener("keydown", handleShortcut);
495495

496-
function resetMouseMoved(ev) {
497-
mouseMovedAfterSearch = true;
498-
}
499-
500-
document.addEventListener("mousemove", resetMouseMoved);
496+
document.addEventListener("mousemove", function() { mouseMovedAfterSearch = true; });
501497

502498
var handleSourceHighlight = (function() {
503499
var prev_line_id = 0;
@@ -2151,14 +2147,14 @@ function defocusSearchBar() {
21512147
var code = document.createElement("code");
21522148
code.innerHTML = struct.text;
21532149

2154-
var x = code.getElementsByTagName("a");
2155-
var xlength = x.length;
2156-
for (var it = 0; it < xlength; it++) {
2157-
var href = x[it].getAttribute("href");
2150+
onEachLazy(code.getElementsByTagName("a"), function(elem) {
2151+
var href = elem.getAttribute("href");
2152+
21582153
if (href && href.indexOf("http") !== 0) {
2159-
x[it].setAttribute("href", rootPath + href);
2154+
elem.setAttribute("href", rootPath + href);
21602155
}
2161-
}
2156+
});
2157+
21622158
var display = document.createElement("h3");
21632159
addClass(display, "impl");
21642160
display.innerHTML = "<span class=\"in-band\"><table class=\"table-display\">" +
@@ -2547,14 +2543,12 @@ function defocusSearchBar() {
25472543
var hiddenElems = e.getElementsByClassName("hidden");
25482544
var needToggle = false;
25492545

2550-
var hlength = hiddenElems.length;
2551-
for (var i = 0; i < hlength; ++i) {
2552-
if (hasClass(hiddenElems[i], "content") === false &&
2553-
hasClass(hiddenElems[i], "docblock") === false) {
2554-
needToggle = true;
2555-
break;
2546+
var needToggle = onEachLazy(e.getElementsByClassName("hidden"), function(hiddenElem) {
2547+
if (hasClass(hiddenElem, "content") === false &&
2548+
hasClass(hiddenElem, "docblock") === false) {
2549+
return true;
25562550
}
2557-
}
2551+
});
25582552
if (needToggle === true) {
25592553
var inner_toggle = newToggle.cloneNode(true);
25602554
inner_toggle.onclick = toggleClicked;

0 commit comments

Comments
 (0)