renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make the article icon code specify the desired article so that it can't pull the wrong one by mistake. Issue #1707

Browse Source
This commit is contained in:
Maurice Parker
2020-01-27 12:58:32 -07:00
parent 470f2159e8
commit 3a99e6430f
9 changed files with 112 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
iOS/Article/WebViewController.swift
View File

@@ -83,7 +83,7 @@ class WebViewController: UIViewController {
webView.configuration.userContentController.removeScriptMessageHandler(forName: MessageName.imageWasClicked)
webView.configuration.userContentController.removeScriptMessageHandler(forName: MessageName.imageWasShown)
webView.removeFromSuperview()
WebViewProvider.shared.enqueueWebView(webView)
coordinator.webViewProvider.enqueueWebView(webView)
webView = nil
}
}
@@ -96,7 +96,7 @@ class WebViewController: UIViewController {
NotificationCenter.default.addObserver(self, selector: #selector(faviconDidBecomeAvailable(_:)), name: .FaviconDidBecomeAvailable, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(contentSizeCategoryDidChange(_:)), name: UIContentSizeCategory.didChangeNotification, object: nil)
WebViewProvider.shared.dequeueWebView() { webView in
coordinator.webViewProvider.dequeueWebView() { webView in
// Add the webview
self.webView = webView
@@ -486,7 +486,6 @@ private extension WebViewController {
restoreWindowScrollY = 0
WebViewProvider.shared.articleIconSchemeHandler.currentArticle = article
webView.scrollView.setZoomScale(1.0, animated: false)
webView.evaluateJavaScript(render)