Skip to content

Commit

Permalink
Improve settings loading strategy by loading CSS and JS at the same t…
Browse files Browse the repository at this point in the history
…ime to prevent the style to be applied afterwards on slow connections
  • Loading branch information
GuillaumeGomez committed May 5, 2022
1 parent 12d3f10 commit 87b6326
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
3 changes: 3 additions & 0 deletions src/librustdoc/html/static/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,9 @@ function loadCss(cssFileName) {

getSettingsButton().onclick = event => {
event.preventDefault();
// Sending request for the CSS and the JS files at the same time so it will
// hopefully be loaded when the JS will generate the settings content.
loadCss("settings");
loadScript(window.settingsJS);
};

Expand Down
5 changes: 1 addition & 4 deletions src/librustdoc/html/static/js/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* eslint prefer-const: "error" */
/* eslint prefer-arrow-callback: "error" */
// Local js definitions:
/* global getSettingValue, getVirtualKey, updateLocalStorage, updateSystemTheme, loadCss */
/* global getSettingValue, getVirtualKey, updateLocalStorage, updateSystemTheme */
/* global addClass, removeClass, onEach, onEachLazy, NOT_DISPLAYED_ID */
/* global MAIN_ID, getVar, getSettingsButton, switchDisplayedElement, getNotDisplayedElem */

Expand Down Expand Up @@ -207,9 +207,6 @@
},
];

// First, we add the settings.css file.
loadCss("settings");

// Then we build the DOM.
const el = document.createElement("section");
el.id = "settings";
Expand Down

0 comments on commit 87b6326

Please sign in to comment.