diff --git a/Mac/MainWindow/Detail/DetailWebViewController.swift b/Mac/MainWindow/Detail/DetailWebViewController.swift index a291908dc..bf047ea5b 100644 --- a/Mac/MainWindow/Detail/DetailWebViewController.swift +++ b/Mac/MainWindow/Detail/DetailWebViewController.swift @@ -27,6 +27,17 @@ final class DetailWebViewController: NSViewController, WKUIDelegate { } } } + + var article: Article? { + switch state { + case .article(let article): + return article + case .extracted(let article, _): + return article + default: + return nil + } + } #if !MAC_APP_STORE private var webInspectorEnabled: Bool { @@ -193,7 +204,8 @@ struct TemplateData: Codable { private extension DetailWebViewController { func reloadArticleImage() { - webView.evaluateJavaScript("reloadArticleImage()") + guard let article = article else { return } + webView?.evaluateJavaScript("reloadArticleImage(\"\(article.articleID)\")") } func reloadHTML() { diff --git a/Shared/Article Rendering/main.js b/Shared/Article Rendering/main.js index cce23f499..c843c9a1c 100644 --- a/Shared/Article Rendering/main.js +++ b/Shared/Article Rendering/main.js @@ -79,9 +79,9 @@ function flattenPreElements() { ElementUnwrapper.unwrapAppropriateChildren("div.articleBody td > pre"); } -function reloadArticleImage() { +function reloadArticleImage(articleID) { var image = document.getElementById("nnwImageIcon"); - image.src = "nnwImageIcon://"; + image.src = "nnwImageIcon://" + articleID; } function error() { diff --git a/iOS/Article/WebViewController.swift b/iOS/Article/WebViewController.swift index 5dcfca2f6..c69ddfc2a 100644 --- a/iOS/Article/WebViewController.swift +++ b/iOS/Article/WebViewController.swift @@ -512,7 +512,8 @@ private extension WebViewController { } func reloadArticleImage() { - webView?.evaluateJavaScript("reloadArticleImage()") + guard let article = article else { return } + webView?.evaluateJavaScript("reloadArticleImage(\"\(article.articleID)\")") } func imageWasClicked(body: String?) {