FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #928 from correia/placeholder-content 

Use noContentHTML rather than noSelectionHTML for prepared web views.
This commit is contained in:
Maurice Parker 2019-08-31 17:20:52 -05:00 committed by GitHub
parent c9858a0457 5f11c42fc2
commit 6caff148dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Shared/Article Rendering/ArticleRenderer.swift
View File

@ -41,6 +41,11 @@ struct ArticleRenderer {
let renderer = ArticleRenderer(article: nil, style: style) let renderer = ArticleRenderer(article: nil, style: style)
return renderer.noSelectionHTML return renderer.noSelectionHTML
} }
static func noContentHTML(style: ArticleStyle) -> String {
let renderer = ArticleRenderer(article: nil, style: style)
return renderer.noContentHTML
}
} }
// MARK: - Private // MARK: - Private
@ -62,6 +67,10 @@ private extension ArticleRenderer {
return renderHTML(withBody: body) return renderHTML(withBody: body)
} }
private var noContentHTML: String {
return renderHTML(withBody: "")
}
static var faviconImgTagCache = [Feed: String]() static var faviconImgTagCache = [Feed: String]()
static var feedIconImgTagCache = [Feed: String]() static var feedIconImgTagCache = [Feed: String]()

2
iOS/Detail/DetailViewController.swift
View File

@ -270,7 +270,7 @@ class DetailViewControllerWebViewProvider {
webView.uiDelegate = nil webView.uiDelegate = nil
webView.navigationDelegate = nil webView.navigationDelegate = nil
let html = ArticleRenderer.noSelectionHTML(style: .defaultStyle) let html = ArticleRenderer.noContentHTML(style: .defaultStyle)
webView.loadHTMLString(html, baseURL: nil) webView.loadHTMLString(html, baseURL: nil)
queue.insert(webView, at: 0) queue.insert(webView, at: 0)