github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 16:21:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #6458 from vinothkannans/fix-giphy

Browse Source 
FIX: Display large/broken image placeholders for image oneboxes
This commit is contained in:
Vinoth Kannan
2018-10-07 18:08:54 +05:30
committed by GitHub
parent 3b6a525e5b c499872597
commit 4000dddd32
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/cooked_post_processor.rb
View File

@ -167,8 +167,6 @@ class CookedPostProcessor
@doc.css("img[src^='data']") -
# minus emojis
@doc.css("img.emoji") -
# minus oneboxed images
oneboxed_images -
# minus images inside quotes
@doc.css(".quote img")
end
@ -440,9 +438,12 @@ class CookedPostProcessor
next if img["src"].blank?
src = img["src"].sub(/^https?:/i, "")
parent = img.parent
img_classes = (img["class"] || "").split(" ")
link_classes = ((parent&.name == "a" && parent["class"]) || "").split(" ")
if large_images.include?(src) || broken_images.include?(src)
img.remove
img.remove unless img_classes.include?("onebox") || link_classes.include?("onebox")
next
end
@ -456,7 +457,7 @@ class CookedPostProcessor
next if img["class"]&.include?('onebox-avatar')
parent_class = img.parent && img.parent["class"]
parent_class = parent && parent["class"]
width = img["width"].to_i
height = img["height"].to_i