From faaf1baba99601938c2fccac7b9be6b7b67d6c01 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Mon, 27 Nov 2023 21:46:02 -0800 Subject: [PATCH] =?UTF-8?q?Remove=20code=20that=20watches=20for=20JavaScri?= =?UTF-8?q?pt=20setting=20change=20=E2=80=94=C2=A0that=20change=20needs=20?= =?UTF-8?q?to=20be=20handled=20elsewhere.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Detail/DetailWebViewController.swift | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/Mac/MainWindow/Detail/DetailWebViewController.swift b/Mac/MainWindow/Detail/DetailWebViewController.swift index e8089c9cb..47866c4cd 100644 --- a/Mac/MainWindow/Detail/DetailWebViewController.swift +++ b/Mac/MainWindow/Detail/DetailWebViewController.swift @@ -63,11 +63,6 @@ final class DetailWebViewController: NSViewController { private var waitingForFirstReload = false private let keyboardDelegate = DetailKeyboardDelegate() private var windowScrollY: CGFloat? - private var isArticleContentJavascriptEnabled = AppDefaults.shared.isArticleContentJavascriptEnabled { - didSet { - reloadHTML() - } - } private var isShowingExtractedArticle: Bool { switch state { @@ -102,7 +97,7 @@ final class DetailWebViewController: NSViewController { let configuration = WKWebViewConfiguration() configuration.preferences = preferences - configuration.defaultWebpagePreferences.allowsContentJavaScript = isArticleContentJavascriptEnabled + configuration.defaultWebpagePreferences.allowsContentJavaScript = AppDefaults.shared.isArticleContentJavascriptEnabled configuration.setURLSchemeHandler(detailIconSchemeHandler, forURLScheme: ArticleRenderer.imageIconScheme) let userContentController = WKUserContentController() @@ -172,19 +167,8 @@ final class DetailWebViewController: NSViewController { } @objc func userDefaultsDidChange(_ note: Notification) { - - var shouldReloadHTML = false - if articleTextSize != AppDefaults.shared.articleTextSize { articleTextSize = AppDefaults.shared.articleTextSize - shouldReloadHTML = true - } - if AppDefaults.shared.isArticleContentJavascriptEnabled != isArticleContentJavascriptEnabled { - isArticleContentJavascriptEnabled = AppDefaults.shared.isArticleContentJavascriptEnabled - shouldReloadHTML = true - } - - if shouldReloadHTML { reloadHTMLMaintainingScrollPosition() } } @@ -266,7 +250,6 @@ extension DetailWebViewController: WKNavigationDelegate, WKUIDelegate { return } - webView.configuration.defaultWebpagePreferences.allowsContentJavaScript = isArticleContentJavascriptEnabled decisionHandler(.allow) }