diff --git a/Mac/MainWindow/Detail/DetailWebViewController.swift b/Mac/MainWindow/Detail/DetailWebViewController.swift index 55e3ed89e..b62b41dac 100644 --- a/Mac/MainWindow/Detail/DetailWebViewController.swift +++ b/Mac/MainWindow/Detail/DetailWebViewController.swift @@ -155,16 +155,12 @@ final class DetailWebViewController: NSViewController { @objc func userDefaultsDidChange(_ note: Notification) { if articleTextSize != AppDefaults.shared.articleTextSize { - articleTextSize = AppDefaults.shared.articleTextSize - webView.evaluateJavaScript("updateTextSize(\"\(articleTextSize.cssClass)\");") + reloadHTMLMaintainingScrollPosition() } } @objc func currentArticleThemeDidChangeNotification(_ note: Notification) { - fetchScrollInfo() { scrollInfo in - self.windowScrollY = scrollInfo?.offsetY - self.reloadHTML() - } + reloadHTMLMaintainingScrollPosition() } // MARK: Media Functions @@ -293,6 +289,13 @@ private extension DetailWebViewController { webView?.evaluateJavaScript("reloadArticleImage(\"\(imageSrc)\")") } } + + func reloadHTMLMaintainingScrollPosition() { + fetchScrollInfo() { scrollInfo in + self.windowScrollY = scrollInfo?.offsetY + self.reloadHTML() + } + } func reloadHTML() { delegate?.mouseDidExit(self) diff --git a/Shared/Article Rendering/main.js b/Shared/Article Rendering/main.js index e24c86fc9..13f90b638 100644 --- a/Shared/Article Rendering/main.js +++ b/Shared/Article Rendering/main.js @@ -132,12 +132,6 @@ function stopMediaPlayback() { }); } -function updateTextSize(cssClass) { - var bodyElement = document.getElementById("bodyContainer"); - bodyElement.classList.remove("smallText", "mediumText", "largeText", "xLargeText", "xxLargeText"); - bodyElement.classList.add(cssClass); -} - function error() { document.body.innerHTML = "error"; }