Merge pull request #30 from dteoh/remove-dark-mode-integration

Defer dark/light mode integration to DevDocs

Author: dteoh

devdocs-macos/DocumentationViewController.swift

@@ -125,14 +125,6 @@ class DocumentationViewController: NSViewController {
 
     // MARK:- JS integration
 
-    func useDarkMode(_ using: Bool) {
-        if using {
-            webView.evaluateJavaScript("useDarkMode(true);")
-        } else {
-            webView.evaluateJavaScript("useDarkMode(false);")
-        }
-    }
-
     func useNativeScrollbars(_ using: Bool) {
         if using {
             webView.evaluateJavaScript("useNativeScrollbars(true);")

devdocs-macos/DocumentationWindowController.swift

@@ -23,8 +23,6 @@ class DocumentationWindowController: NSWindowController {
     }
 
     override func windowDidLoad() {
-        observeEffectiveAppearance()
-
         guard let dvc = documentationViewController else { return }
 
         NotificationCenter.default.addObserver(self,
@@ -59,16 +57,6 @@ class DocumentationWindowController: NSWindowController {
 
         dvc.overridePreferencesExport()
         dvc.useNativeScrollbars(true)
-
-        guard let window = self.window else { return }
-        switch window.effectiveAppearance.name {
-        case .aqua:
-            dvc.useDarkMode(false)
-        case .darkAqua:
-            dvc.useDarkMode(true)
-        default:
-            break;
-        }
     }
 
     @objc private func observeDocumentTitle() {
@@ -90,27 +78,6 @@ class DocumentationWindowController: NSWindowController {
         guard let dvc = documentationViewController else { return }
         dvc.showSearchControl()
     }
-
-    // MARK:- KVO observers
-
-    private func observeEffectiveAppearance() {
-        guard let window = self.window else { return }
-        observations.insert(
-            window.observe(\NSWindow.effectiveAppearance) { [weak self] (win, _) in
-                guard let dvc = self?.documentationViewController else {
-                    return
-                }
-                switch window.effectiveAppearance.name {
-                case .aqua:
-                    dvc.useDarkMode(false)
-                case .darkAqua:
-                    dvc.useDarkMode(true)
-                default:
-                    break;
-                }
-            }
-        )
-    }
 }
 
 // MARK:- DocumentationViewDelegate

devdocs-macos/user-scripts/ui-settings.js

@@ -1,19 +1,5 @@
 /* global app */
 
-window.useDarkMode = function (enable) {
-  requestAnimationFrame(() => {
-    const inDarkMode = !!app.settings.get('dark')
-    if (enable && inDarkMode) {
-      return
-    }
-    if (!enable && !inDarkMode) {
-      return
-    }
-    const sp = new app.views.SettingsPage()
-    sp.toggleDark(enable)
-  })
-}
-
 window.useNativeScrollbars = function (enable) {
   requestAnimationFrame(() => {
     const sp = new app.views.SettingsPage()