From 1d54566688429dae8f26d10ae026229050e3286f Mon Sep 17 00:00:00 2001
From: George Cushen <gcushen@users.noreply.github.com>
Date: Tue, 8 Dec 2020 22:17:17 +0000
Subject: [PATCH] refactor: JS

---
 wowchemy/assets/js/wowchemy-theming.js | 13 +++++++------
 wowchemy/assets/js/wowchemy.js         | 10 ++++++++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/wowchemy/assets/js/wowchemy-theming.js b/wowchemy/assets/js/wowchemy-theming.js
index 74d761ce..d7222d4f 100644
--- a/wowchemy/assets/js/wowchemy-theming.js
+++ b/wowchemy/assets/js/wowchemy-theming.js
@@ -9,7 +9,7 @@
 import {fadeIn} from './wowchemy-animation';
 
 function getThemeMode() {
-  return parseInt(localStorage.getItem('dark_mode') || 2);
+  return parseInt(localStorage.getItem('wcTheme') || 2);
 }
 
 function canChangeTheme() {
@@ -59,13 +59,13 @@ function changeThemeModeClick(newMode) {
   let isDarkTheme;
   switch (newMode) {
     case 0:
-      localStorage.setItem('dark_mode', '1');
+      localStorage.setItem('wcTheme', '1');
       isDarkTheme = true;
       console.info('User changed theme variation to Dark.');
       showActiveTheme(0);
       break;
     case 1:
-      localStorage.setItem('dark_mode', '2');
+      localStorage.setItem('wcTheme', '2');
       if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
         // The visitor prefers dark themes and switching to the dark variation is allowed by admin.
         isDarkTheme = true;
@@ -73,13 +73,14 @@ function changeThemeModeClick(newMode) {
         // The visitor prefers light themes and switching to the dark variation is allowed by admin.
         isDarkTheme = false;
       } else {
-        isDarkTheme = window.wc.isSiteThemeDark;  // Use the site's default theme variation based on `light` in the theme file.
+        // Use the site's default theme variation based on `light` in the theme file.
+        isDarkTheme = window.wc.isSiteThemeDark;
       }
       console.info('User changed theme variation to Auto.');
       showActiveTheme(1);
       break;
     default:
-      localStorage.setItem('dark_mode', '0');
+      localStorage.setItem('wcTheme', '0');
       isDarkTheme = false;
       console.info('User changed theme variation to Light.');
       showActiveTheme(2);
@@ -141,7 +142,6 @@ function renderThemeVariation(isDarkTheme, init = false) {
   if (isDarkTheme === false) {
     if (!init) {
       // Only fade in the page when changing the theme variation.
-      //$('body').css({opacity: 0, visibility: 'visible'}).animate({opacity: 1}, 500);
       Object.assign(document.body.style, {opacity: 0, visibility: 'visible'});
       fadeIn(document.body, 600);
     }
@@ -188,4 +188,5 @@ export {
   initThemeVariation,
   changeThemeModeClick,
   renderThemeVariation,
+  getThemeMode,
 };
diff --git a/wowchemy/assets/js/wowchemy.js b/wowchemy/assets/js/wowchemy.js
index 2cd55e98..1fb082e6 100644
--- a/wowchemy/assets/js/wowchemy.js
+++ b/wowchemy/assets/js/wowchemy.js
@@ -5,7 +5,13 @@
  *  Core JS functions and initialization.
  **************************************************/
 
-import {canChangeTheme, changeThemeModeClick, initThemeVariation, renderThemeVariation} from './wowchemy-theming';
+import {
+  canChangeTheme,
+  changeThemeModeClick,
+  getThemeMode,
+  initThemeVariation,
+  renderThemeVariation
+} from './wowchemy-theming';
 
 
 /* ---------------------------------------------------------------------------
@@ -442,7 +448,7 @@ $(document).ready(function () {
     }
     const darkModeOn = e.matches;
     console.log(`OS dark mode preference changed to ${darkModeOn ? '🌒 on' : '☀️ off'}.`);
-    let currentThemeVariation = parseInt(localStorage.getItem('dark_mode') || 2);
+    let currentThemeVariation = getThemeMode();
     let isDarkTheme;
     if (currentThemeVariation === 2) {
       if (window.matchMedia('(prefers-color-scheme: dark)').matches) {