From d01e9cef425bcf0066656d63ba71ae18c0645b46 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Thu, 13 Feb 2020 16:08:44 -0800 Subject: [PATCH] Remove unintended web view load when changing the article. --- iOS/Article/WebViewController.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/iOS/Article/WebViewController.swift b/iOS/Article/WebViewController.swift index f621ba592..a01107185 100644 --- a/iOS/Article/WebViewController.swift +++ b/iOS/Article/WebViewController.swift @@ -46,11 +46,7 @@ class WebViewController: UIViewController { windowScrollY = 0 } } - var isShowingExtractedArticle = false { - didSet { - loadWebView() - } - } + var isShowingExtractedArticle = false var articleExtractorButtonState: ArticleExtractorButtonState = .off { didSet { @@ -189,11 +185,13 @@ class WebViewController: UIViewController { guard articleExtractor?.state != .processing else { stopArticleExtractor() + loadWebView() return } guard !isShowingExtractedArticle else { isShowingExtractedArticle = false + loadWebView() articleExtractorButtonState = .off return } @@ -201,6 +199,7 @@ class WebViewController: UIViewController { if let articleExtractor = articleExtractor { if article.preferredLink == articleExtractor.articleLink { isShowingExtractedArticle = true + loadWebView() articleExtractorButtonState = .on } } else { @@ -241,6 +240,7 @@ extension WebViewController: ArticleExtractorDelegate { if articleExtractor?.state != .cancelled { self.extractedArticle = extractedArticle isShowingExtractedArticle = true + loadWebView() articleExtractorButtonState = .on } }