From bfa488f77d592d088ffe43fc14419075b0b7c0dd Mon Sep 17 00:00:00 2001 From: Omar Roth Date: Sun, 5 May 2019 07:34:27 -0500 Subject: [PATCH] Add option to toggle theme without reload --- assets/js/themes.js | 34 ++++++++++++++++++++++++++++++++ src/invidious.cr | 11 ++++++++++- src/invidious/views/template.ecr | 12 +++++------ 3 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 assets/js/themes.js diff --git a/assets/js/themes.js b/assets/js/themes.js new file mode 100644 index 00000000..178ff112 --- /dev/null +++ b/assets/js/themes.js @@ -0,0 +1,34 @@ +var toggle_theme = document.getElementById('toggle_theme') +toggle_theme.href = 'javascript:void(0);'; + +toggle_theme.addEventListener('click', function () { + var dark_mode = document.getElementById('dark_theme').media == 'none'; + + var url = '/toggle_theme?redirect=false'; + var xhr = new XMLHttpRequest(); + xhr.responseType = 'json'; + xhr.timeout = 20000; + xhr.open('GET', url, true); + xhr.send(); + + set_mode(dark_mode); + localStorage.setItem('dark_mode', dark_mode); +}); + +window.addEventListener('storage', function (e) { + if (e.key == 'dark_mode') { + var dark_mode = e.newValue === 'true'; + set_mode(dark_mode); + } +}); + +function set_mode(bool) { + document.getElementById('dark_theme').media = !bool ? 'none' : ''; + document.getElementById('light_theme').media = bool ? 'none' : ''; + + if (bool) { + toggle_theme.children[0].setAttribute('class', 'icon ion-ios-sunny'); + } else { + toggle_theme.children[0].setAttribute('class', 'icon ion-ios-moon'); + } +} diff --git a/src/invidious.cr b/src/invidious.cr index 9ba9d869..2ef89ac3 100644 --- a/src/invidious.cr +++ b/src/invidious.cr @@ -1437,6 +1437,10 @@ get "/toggle_theme" do |env| locale = LOCALES[env.get("preferences").as(Preferences).locale]? referer = get_referer(env) + redirect = env.params.query["redirect"]? + redirect ||= "true" + redirect = redirect == "true" + if user = env.get? "user" user = user.as(User) preferences = user.preferences @@ -1463,7 +1467,12 @@ get "/toggle_theme" do |env| end end - env.redirect referer + if redirect + env.redirect referer + else + env.response.content_type = "application/json" + "{}" + end end post "/watch_ajax" do |env| diff --git a/src/invidious/views/template.ecr b/src/invidious/views/template.ecr index 6df0733f..247e36b4 100644 --- a/src/invidious/views/template.ecr +++ b/src/invidious/views/template.ecr @@ -18,11 +18,8 @@ - <% if env.get("preferences").as(Preferences).dark_mode %> - - <% else %> - - <% end %> + media="none"<% end %>> + media="none"<% end %>> <% locale = LOCALES[env.get("preferences").as(Preferences).locale]? %> @@ -45,7 +42,7 @@
<% if env.get? "user" %> <% else %>
+