1
Fork 0

Rollup merge of #82807 - notriddle:cleanup-js, r=jyn514

rustdoc: Remove redundant enableSearchInput function

enableSearchInput was called from two places:

- setupSearchLoader
- addSearchOptions, which is itself called from setupSearchLoader only

This commit can safely get rid of the addSearchOptions calls entirely, and since the setupSearchLoader call is immediately preceded by other method calls on search_input, there's no need to check if it's set.
This commit is contained in:
Dylan DPC 2021-03-10 17:55:40 +01:00 committed by GitHub
commit 9ac57b1520
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2188,7 +2188,7 @@ function defocusSearchBar() {
return "+";
}
// button will collapse the section
// note that this text is also set in the HTML template in render.rs
// note that this text is also set in the HTML template in ../render/mod.rs
return "\u2212"; // "\u2212" is "" minus sign
}
@ -2831,17 +2831,10 @@ function defocusSearchBar() {
});
}
function enableSearchInput() {
if (search_input) {
search_input.removeAttribute('disabled');
}
}
function addSearchOptions(crates) {
var elem = document.getElementById("crate-search");
if (!elem) {
enableSearchInput();
return;
}
var savedCrate = getSettingValue("saved-filter-crate");
@ -2860,7 +2853,6 @@ function defocusSearchBar() {
elem.value = savedCrate;
}
}
enableSearchInput();
};
function buildHelperPopup() {
@ -2952,7 +2944,7 @@ function defocusSearchBar() {
search_input.addEventListener("blur", function() {
search_input.placeholder = search_input.origPlaceholder;
});
enableSearchInput();
search_input.removeAttribute('disabled');
var crateSearchDropDown = document.getElementById("crate-search");
crateSearchDropDown.addEventListener("focus", loadSearch);