FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't image zoom any previews that are just links out

Browse Source
This commit is contained in:
Maurice Parker 2020-05-06 21:56:01 -05:00
parent 0f06618c1f
commit 9429f36095
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Frameworks/Account/FeedProvider/Reddit/RedditLink.swift
View File

@ -28,6 +28,7 @@ struct RedditLinkData: Codable {
let id: String? let id: String?
let selfHTML: String? let selfHTML: String?
let selfText: String? let selfText: String?
let postHint: String?
let author: String? let author: String?
let created: Double? let created: Double?
let isVideo: Bool? let isVideo: Bool?
@ -42,6 +43,7 @@ struct RedditLinkData: Codable {
case id = "id" case id = "id"
case selfHTML = "selftext_html" case selfHTML = "selftext_html"
case selfText = "selftext" case selfText = "selftext"
case postHint = "post_hint"
case author = "author" case author = "author"
case created = "created_utc" case created = "created_utc"
case isVideo = "is_video" case isVideo = "is_video"
@ -104,6 +106,9 @@ struct RedditLinkData: Codable {
if let imageSource = preview?.images?.first?.source, let imageURL = imageSource.url { if let imageSource = preview?.images?.first?.source, let imageURL = imageSource.url {
var html = "<a href=\"\(url)\"><img src=\"\(imageURL)\" " var html = "<a href=\"\(url)\"><img src=\"\(imageURL)\" "
if postHint == "link" {
html += "class=\"nnw-nozoom\" "
}
if let width = imageSource.width, let height = imageSource.height { if let width = imageSource.width, let height = imageSource.height {
html += "width=\"\(width)\" height=\"\(height)\" " html += "width=\"\(width)\" height=\"\(height)\" "
} }

2
iOS/Resources/main_ios.js
View File

@ -100,7 +100,7 @@ class ImageViewer {
// Add the click listener for images // Add the click listener for images
window.onclick = function(event) { window.onclick = function(event) {
if (event.target.matches("img")) { if (event.target.matches("img") && !event.target.classList.contains("nnw-nozoom")) {
if (activeImageViewer && activeImageViewer.img === event.target) { if (activeImageViewer && activeImageViewer.img === event.target) {
cancelImageLoad(); cancelImageLoad();
} else { } else {