dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #110162 - notriddle:notriddle/main-js-expand, r=GuillaumeGomez 

rustdoc: remove redundant expandSection code from main.js

This functionality is already tested in `hash-item-expansion.goml`, and was implemented twice:

* First, in code that ran at load time and at hash change: 917cdd295d

* Later, the hash change event handler was itself run at load time, and the code handling both cases diverged in implementation, though their behavior still matches pretty well: f66a331335
This commit is contained in:
Michael Goulet 2023-04-11 20:28:49 -07:00 committed by GitHub
parent e6975455d9 dd28cfbc85
commit d22b019dbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/librustdoc/html/static/js/main.js
View File

@ -331,10 +331,6 @@ function preLoadCss(cssUrl) {
},
};
function getPageId() {
return window.location.hash.replace(/^#/, "");
}
const toggleAllDocsId = "toggle-all-docs";
let savedHash = "";
@ -355,12 +351,12 @@ function preLoadCss(cssUrl) {
}
}
// This part is used in case an element is not visible.
if (savedHash !== window.location.hash) {
savedHash = window.location.hash;
if (savedHash.length === 0) {
return;
const pageId = window.location.hash.replace(/^#/, "");
if (savedHash !== pageId) {
savedHash = pageId;
if (pageId !== "") {
expandSection(pageId);
}
expandSection(savedHash.slice(1)); // we remove the '#'
}
}
@ -699,11 +695,6 @@ function preLoadCss(cssUrl) {
}
});
const pageId = getPageId();
if (pageId !== "") {
expandSection(pageId);
}
}());
window.rustdoc_add_line_numbers_to_examples = () => {