ProjectSegfault/invidious-experimenting
4
0
Fork 0
forked from midou/invidious
Code Pull Requests Activity

fix: null ptr while loading/switching theme

Browse Source
This commit is contained in:
Théo Gaillard 2021-12-26 13:53:32 +01:00
parent 0453d08eed
commit 73a142fd9b
No known key found for this signature in database
GPG Key ID: 9C6AAAF893B070FC
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assets/js/themes.js
View File

@ -11,7 +11,9 @@ toggle_theme.addEventListener('click', function () {
xhr.open('GET', url, true); xhr.open('GET', url, true);
set_mode(dark_mode); set_mode(dark_mode);
try {
window.localStorage.setItem('dark_mode', dark_mode ? 'dark' : 'light'); window.localStorage.setItem('dark_mode', dark_mode ? 'dark' : 'light');
} catch {}
xhr.send(); xhr.send();
}); });
@ -23,9 +25,12 @@ window.addEventListener('storage', function (e) {
}); });
window.addEventListener('DOMContentLoaded', function () { window.addEventListener('DOMContentLoaded', function () {
window.localStorage.setItem('dark_mode', document.getElementById('dark_mode_pref').textContent); const dark_mode = document.getElementById('dark_mode_pref').textContent;
try {
// Update localStorage if dark mode preference changed on preferences page // Update localStorage if dark mode preference changed on preferences page
update_mode(window.localStorage.dark_mode); window.localStorage.setItem('dark_mode', dark_mode);
} catch {}
update_mode(dark_mode);
}); });
@ -37,9 +42,11 @@ lightScheme.addListener(scheme_switch);
function scheme_switch (e) { function scheme_switch (e) {
// ignore this method if we have a preference set // ignore this method if we have a preference set
try {
if (localStorage.getItem('dark_mode')) { if (localStorage.getItem('dark_mode')) {
return; return;
} }
} catch {}
if (e.matches) { if (e.matches) {
if (e.media.includes("dark")) { if (e.media.includes("dark")) {
set_mode(true); set_mode(true);