diff options
| author | Jonas Schievink <jonasschievink@gmail.com> | 2020-10-24 14:12:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-24 14:12:16 +0200 |
| commit | a07fc3d86508c43476a7721c091482243544bfcf (patch) | |
| tree | 2f7a67093e0277c5c5c6e04b182eb679a1960774 | |
| parent | 2362659b00c1d99ccaed64815575beba69cd3714 (diff) | |
| parent | a0ce1e095e0d89d35ff3de20541dd4faf79607da (diff) | |
Rollup merge of #78293 - nasso:master, r=GuillaumeGomez
Always store Rustdoc theme when it's changed `switchTheme` (too) lazily updated the value of `rustdoc-theme` in `localStorage`, leading to an incorrect stored value when the system theme is the same as the default (`light`) theme. Fixes #78273
| -rw-r--r-- | src/librustdoc/html/static/storage.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/librustdoc/html/static/storage.js b/src/librustdoc/html/static/storage.js index a027d6845ea..ef734f260af 100644 --- a/src/librustdoc/html/static/storage.js +++ b/src/librustdoc/html/static/storage.js @@ -94,6 +94,12 @@ function switchTheme(styleElem, mainStyleElem, newTheme, saveTheme) { var fullNewTheme = newTheme + resourcesSuffix + ".css"; var newHref = mainStyleElem.href.replace(fullBasicCss, fullNewTheme); + // If this new value comes from a system setting or from the previously + // saved theme, no need to save it. + if (saveTheme === true) { + updateLocalStorage("rustdoc-theme", newTheme); + } + if (styleElem.href === newHref) { return; } @@ -112,11 +118,6 @@ function switchTheme(styleElem, mainStyleElem, newTheme, saveTheme) { }); if (found === true) { styleElem.href = newHref; - // If this new value comes from a system setting or from the previously - // saved theme, no need to save it. - if (saveTheme === true) { - updateLocalStorage("rustdoc-theme", newTheme); - } } } |
