From 9b92fcfc2cdfecb1c84d55d166e27a34ffc7dfb3 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Mon, 11 Feb 2019 22:43:04 -0800 Subject: [PATCH] Make baseURL a private extension computed var for Article. --- .../MainWindow/Detail/DetailWebViewController.swift | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/NetNewsWire/MainWindow/Detail/DetailWebViewController.swift b/NetNewsWire/MainWindow/Detail/DetailWebViewController.swift index d884657e0..f50fd8c5b 100644 --- a/NetNewsWire/MainWindow/Detail/DetailWebViewController.swift +++ b/NetNewsWire/MainWindow/Detail/DetailWebViewController.swift @@ -121,19 +121,22 @@ private extension DetailWebViewController { html = ArticleRenderer.multipleSelectionHTML(style: style, appearance: appearance) case .article(let article): html = ArticleRenderer.articleHTML(article: article, style: style, appearance: appearance) - baseURL = DetailWebViewController.baseURL(for: article) + baseURL = article.baseURL } webview.loadHTMLString(html, baseURL: baseURL) } +} - static func baseURL(for article: Article) -> URL? { - var s = article.url +private extension Article { + + var baseURL: URL? { + var s = url if s == nil { - s = article.feed?.homePageURL + s = feed?.homePageURL } if s == nil { - s = article.feed?.url + s = feed?.url } guard let urlString = s else {