Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"require": "readonly"
},
"parserOptions": {
"ecmaVersion": 2018,
"ecmaVersion": 2021,
"requireConfigFile": false,
"sourceType": "module"
},
Expand Down
52 changes: 41 additions & 11 deletions src/theme/book.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

/* global default_theme, hljs, ClipboardJS */
/* global default_theme, default_dark_theme, default_light_theme, hljs, ClipboardJS */

// Fix back button cache problem
window.onunload = function() { };
Expand Down Expand Up @@ -329,7 +329,13 @@ aria-label="Show hidden lines"></button>';
themePopup.querySelectorAll('.theme-selected').forEach(function(el) {
el.classList.remove('theme-selected');
});
themePopup.querySelector('button#' + get_theme()).classList.add('theme-selected');
const selected = get_saved_theme() ?? 'default_theme';
let element = themePopup.querySelector('button#' + selected);
if (element === null) {
// Fall back in case there is no "Default" item.
element = themePopup.querySelector('button#' + get_theme());
}
element.classList.add('theme-selected');
}

function hideThemes() {
Expand All @@ -338,20 +344,37 @@ aria-label="Show hidden lines"></button>';
themeToggleButton.focus();
}

function get_theme() {
let theme;
function get_saved_theme() {
let theme = null;
try {
theme = localStorage.getItem('mdbook-theme');
} catch (e) {
// ignore error.
}
return theme;
}

function delete_saved_theme() {
localStorage.removeItem('mdbook-theme');
}

function get_theme() {
const theme = get_saved_theme();
if (theme === null || theme === undefined || !themeIds.includes(theme)) {
return default_theme;
if (typeof default_dark_theme === 'undefined') {
// A customized index.hbs might not define this, so fall back to
// old behavior of determining the default on page load.
return default_theme;
}
return window.matchMedia('(prefers-color-scheme: dark)').matches
? default_dark_theme
: default_light_theme;
} else {
return theme;
}
}

let previousTheme = default_theme;
function set_theme(theme, store = true) {
let ace_theme;

Expand Down Expand Up @@ -383,8 +406,6 @@ aria-label="Show hidden lines"></button>';
});
}

const previousTheme = get_theme();

if (store) {
try {
localStorage.setItem('mdbook-theme', theme);
Expand All @@ -395,13 +416,17 @@ aria-label="Show hidden lines"></button>';

html.classList.remove(previousTheme);
html.classList.add(theme);
previousTheme = theme;
updateThemeSelected();
}

// Set theme
const theme = get_theme();
const query = window.matchMedia('(prefers-color-scheme: dark)');
query.onchange = function() {
set_theme(get_theme(), false);
};

set_theme(theme, false);
// Set theme.
set_theme(get_theme(), false);

themeToggleButton.addEventListener('click', function() {
if (themePopup.style.display === 'block') {
Expand All @@ -420,7 +445,12 @@ aria-label="Show hidden lines"></button>';
} else {
return;
}
set_theme(theme);
if (theme === 'default_theme' || theme === null) {
delete_saved_theme();
set_theme(get_theme(), false);
} else {
set_theme(theme);
}
});

themePopup.addEventListener('focusout', function(e) {
Expand Down
7 changes: 5 additions & 2 deletions src/theme/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@
<script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
{{/if}}

<!-- Provide site root to javascript -->
<!-- Provide site root and default themes to javascript -->
<script>
const path_to_root = "{{ path_to_root }}";
const default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
const default_light_theme = "{{ default_theme }}";
const default_dark_theme = "{{ preferred_dark_theme }}";
</script>
<!-- Start loading toc.js asap -->
<script src="{{ resource "toc.js" }}"></script>
Expand All @@ -81,6 +82,7 @@

<!-- Set the theme before any content is loaded, prevents flash -->
<script>
const default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? default_dark_theme : default_light_theme;
let theme;
try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
if (theme === null || theme === undefined) { theme = default_theme; }
Expand Down Expand Up @@ -132,6 +134,7 @@
<i class="fa fa-paint-brush"></i>
</button>
<ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
<li role="none"><button role="menuitem" class="theme" id="default_theme">Auto</button></li>
<li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
<li role="none"><button role="menuitem" class="theme" id="rust">Rust</button></li>
<li role="none"><button role="menuitem" class="theme" id="coal">Coal</button></li>
Expand Down