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

Change iOS webview baseURL handling to match macOS version.

This commit is contained in:
Maurice Parker 2019-04-19 07:37:47 -05:00
parent 7f392f848c
commit 59a30fdd34
2 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Shared/Article Rendering/ArticleRenderer.swift
View File

@ -365,6 +365,9 @@ private extension ArticleRenderer {
func renderHTML(withBody body: String) -> String { func renderHTML(withBody body: String) -> String {
var s = "<!DOCTYPE html><html><head>\n" var s = "<!DOCTYPE html><html><head>\n"
if let baseURL = baseURL {
s += ("<base href=\"" + baseURL + "\"\n>")
}
s += "<meta name=\"viewport\" content=\"width=device-width\">\n" s += "<meta name=\"viewport\" content=\"width=device-width\">\n"
s += title.htmlBySurroundingWithTag("title") s += title.htmlBySurroundingWithTag("title")
s += styleString().htmlBySurroundingWithTag("style") s += styleString().htmlBySurroundingWithTag("style")

30
iOS/Detail/DetailViewController.swift
View File

@ -64,7 +64,7 @@ class DetailViewController: UIViewController {
} }
let style = ArticleStylesManager.shared.currentStyle let style = ArticleStylesManager.shared.currentStyle
let html = ArticleRenderer.articleHTML(article: article, style: style) let html = ArticleRenderer.articleHTML(article: article, style: style)
webView.loadHTMLString(html, baseURL: article.baseURL) webView.loadHTMLString(html, baseURL: nil)
} }
@objc func statusesDidChange(_ note: Notification) { @objc func statusesDidChange(_ note: Notification) {
@ -155,33 +155,5 @@ extension DetailViewController: WKNavigationDelegate {
} }
} }
}
private extension Article {
var baseURL: URL? {
var s = url
if s == nil {
s = feed?.homePageURL
}
if s == nil {
s = feed?.url
}
guard let urlString = s else {
return nil
}
var urlComponents = URLComponents(string: urlString)
if urlComponents == nil {
return nil
}
// Can’t use url-with-fragment as base URL. The webview won’t load. See scripting.com/rss.xml for example.
urlComponents!.fragment = nil
guard let url = urlComponents!.url, url.scheme == "http" || url.scheme == "https" else {
return nil
}
return url
}
} }