PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2024-12-17 22:47:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

avoid showing massive spoiler boxes in forums

Browse source
This commit is contained in:
byte[] 2019-12-19 02:02:08 -05:00
parent 391c754a42
commit c01ef54a71
2 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/philomena/textile/renderer.ex
View file

@ -79,15 +79,15 @@ defmodule Philomena.Textile.Renderer do
match
[image, "p"] ->
Phoenix.View.render(PhilomenaWeb.ImageView, "_image_container.html", image: image, size: :medium, conn: conn)
Phoenix.View.render(PhilomenaWeb.ImageView, "_image_target.html", image: image, size: :medium, conn: conn)
|> safe_to_string()
[image, "t"] ->
Phoenix.View.render(PhilomenaWeb.ImageView, "_image_container.html", image: image, size: :small, conn: conn)
Phoenix.View.render(PhilomenaWeb.ImageView, "_image_target.html", image: image, size: :small, conn: conn)
|> safe_to_string()
[image, "s"] ->
Phoenix.View.render(PhilomenaWeb.ImageView, "_image_container.html", image: image, size: :thumb_small, conn: conn)
Phoenix.View.render(PhilomenaWeb.ImageView, "_image_target.html", image: image, size: :thumb_small, conn: conn)
|> safe_to_string()
[image] ->

18
lib/philomena_web/templates/image/_image_target.html.slime
View file

@ -1,4 +1,6 @@
= content_tag :div, [data: image_container_data(@conn, @image, :full), class: "image-show-container"] do
- size = assigns[:size] || :full
= content_tag :div, [data: image_container_data(@conn, @image, size), class: "image-show-container"] do
.block.block--fixed.block--warning.block--no-margin.image-filtered.hidden
strong
= link("This image is blocked by your current filter - click here to display it anyway", to: "#", data: [click_unfilter: @image.id])
@ -8,8 +10,22 @@
=< link("your current filter", to: Routes.filter_path(@conn, :show, @conn.assigns.current_filter), class: "filter-link")
' .
= if size == :full do
#image_target.hidden.image-show data-scaled=scaled_value(@conn.assigns.current_user) data-uris=Jason.encode!(thumb_urls(@image, can?(@conn, :hide, @image))) data-width=@image.image_width data-height=@image.image_height
= if @image.image_mime_type == "video/webm" do
video controls=true
- else
picture
- else
.image-show.hidden
a href=Routes.image_path(@conn, :show, @image)
span.imgspoiler
- thumb_url = thumb_url(@image, can?(@conn, :show, @image), size)
= if @image.image_mime_type == "video/webm" do
video data-image-id=@image.id autoplay="autoplay" loop="loop" muted="muted" playsinline="playsinline"
source src=thumb_url type="video/webm"
source src=String.replace(thumb_url, ".webm", ".mp4") type="video/mp4"
- else
picture data-image-id=@image.id
img src=thumb_url