From f0a5309786c6c9452dbefc63905deb373ebfadd2 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Tue, 31 Dec 2019 17:06:13 -0700 Subject: [PATCH] Fix bug that prevented first article from being selected on iPad. --- iOS/Article/WebViewController.swift | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/iOS/Article/WebViewController.swift b/iOS/Article/WebViewController.swift index a79a649d9..14383460c 100644 --- a/iOS/Article/WebViewController.swift +++ b/iOS/Article/WebViewController.swift @@ -61,7 +61,7 @@ class WebViewController: UIViewController { if article?.webFeed?.isArticleExtractorAlwaysOn ?? false { startArticleExtractor() } - if oldValue != nil && article != oldValue { + if article != oldValue { reloadHTML() } } @@ -124,7 +124,8 @@ class WebViewController: UIViewController { } func reloadHTML() { - + guard let webView = webView else { return } + let style = ArticleStylesManager.shared.currentStyle let rendering: ArticleRenderer.Rendering @@ -154,8 +155,8 @@ class WebViewController: UIViewController { restoreOffset = 0 WebViewProvider.shared.articleIconSchemeHandler.currentArticle = article - webView?.scrollView.setZoomScale(1.0, animated: false) - webView?.evaluateJavaScript(render) + webView.scrollView.setZoomScale(1.0, animated: false) + webView.evaluateJavaScript(render) }