Darkmode could not be disabled (#8004)

OrchardCMS · Dec 15, 2020 · 749bde3 · 749bde3
1 parent 6834238
commit 749bde3
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 24 deletions.
diff --git a/src/OrchardCore.Themes/TheAdmin/Assets/js/header/userPreferencesLoader.js b/src/OrchardCore.Themes/TheAdmin/Assets/js/header/userPreferencesLoader.js
@@ -19,26 +19,32 @@ var observer = new MutationObserver(function (mutations) {
                     }
                     isCompactExplicit = adminPreferences.isCompactExplicit;
 
-                    if (adminPreferences.darkMode){
-                        html.setAttribute('data-theme', 'darkmode');
-                    }
-                    else
+                    if(html.getAttribute('data-darkmode') === 'True')
                     {
-                        html.setAttribute('data-theme', 'default');
+                        if (adminPreferences.darkMode){
+                            html.setAttribute('data-theme', 'darkmode');
+                        }
+                        else
+                        {
+                            html.setAttribute('data-theme', 'default');
+                        }
                     }
                 } 
                 else 
                 {
                     body.classList.add('no-admin-preferences');
 
-                    // Automatically sets darkmode based on OS preferences
-                    if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches)
-                    {
-                        html.setAttribute('data-theme', 'darkmode');
-                    }
-                    else
+                    if(html.getAttribute('data-darkmode') === 'True')
                     {
-                        html.setAttribute('data-theme', 'default');
+                        // Automatically sets darkmode based on OS preferences
+                        if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches)
+                        {
+                            html.setAttribute('data-theme', 'darkmode');
+                        }
+                        else
+                        {
+                            html.setAttribute('data-theme', 'default');
+                        }
                     }
                 }
 

diff --git a/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml b/src/OrchardCore.Themes/TheAdmin/Views/Layout.cshtml
@@ -5,7 +5,7 @@
     var darkMode = await DarkModeService.IsDarkModeAsync();
 }
 <!DOCTYPE html>
-<html lang="@Orchard.CultureName()" dir="@Orchard.CultureDir()" data-theme="@DarkModeService.CurrentTheme">
+<html lang="@Orchard.CultureName()" dir="@Orchard.CultureDir()" data-theme="@DarkModeService.CurrentTheme" data-darkmode="@adminSettings.DisplayDarkMode">
 <head>
     <title>@RenderTitleSegments(Site.SiteName, "before")</title>
     <meta charset="utf-8">

diff --git a/src/OrchardCore.Themes/TheAdmin/wwwroot/Scripts/TheAdmin-header.js b/src/OrchardCore.Themes/TheAdmin/wwwroot/Scripts/TheAdmin-header.js
@@ -23,18 +23,23 @@ var observer = new MutationObserver(function (mutations) {
 
           isCompactExplicit = adminPreferences.isCompactExplicit;
 
-          if (adminPreferences.darkMode) {
-            html.setAttribute('data-theme', 'darkmode');
-          } else {
-            html.setAttribute('data-theme', 'default');
+          if (html.getAttribute('data-darkmode') === 'True') {
+            if (adminPreferences.darkMode) {
+              html.setAttribute('data-theme', 'darkmode');
+            } else {
+              html.setAttribute('data-theme', 'default');
+            }
           }
         } else {
-          body.classList.add('no-admin-preferences'); // Automatically sets darkmode based on OS preferences
-
-          if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
-            html.setAttribute('data-theme', 'darkmode');
-          } else {
-            html.setAttribute('data-theme', 'default');
+          body.classList.add('no-admin-preferences');
+
+          if (html.getAttribute('data-darkmode') === 'True') {
+            // Automatically sets darkmode based on OS preferences
+            if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
+              html.setAttribute('data-theme', 'darkmode');
+            } else {
+              html.setAttribute('data-theme', 'default');
+            }
           }
         } // we're done: 
 

diff --git a/src/OrchardCore.Themes/TheAdmin/wwwroot/Scripts/TheAdmin-header.min.js b/src/OrchardCore.Themes/TheAdmin/wwwroot/Scripts/TheAdmin-header.min.js