diff --git a/app/models/post.rb b/app/models/post.rb index ef6d14d6a..1bbd402e9 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -220,10 +220,6 @@ class Post < ApplicationRecord def has_dimensions? image_width.present? && image_height.present? end - - def has_ugoira_webm? - true - end end module ImageMethods diff --git a/app/views/posts/partials/show/_ugoira.html.erb b/app/views/posts/partials/show/_ugoira.html.erb index e08516c0b..bf438281c 100644 --- a/app/views/posts/partials/show/_ugoira.html.erb +++ b/app/views/posts/partials/show/_ugoira.html.erb @@ -1,4 +1,4 @@ -<% if CurrentUser.user.default_image_size == "large" && params[:original].blank? && post.has_ugoira_webm? %> +<% if CurrentUser.user.default_image_size == "large" && params[:original].blank? %> <%= render "posts/partials/show/ugoira_webm", :post => post %> <% else %> <%= render "posts/partials/show/ugoira_original", :post => post %> diff --git a/app/views/posts/partials/show/_ugoira_original.html.erb b/app/views/posts/partials/show/_ugoira_original.html.erb index 8d32f0778..cfe720603 100644 --- a/app/views/posts/partials/show/_ugoira_original.html.erb +++ b/app/views/posts/partials/show/_ugoira_original.html.erb @@ -15,9 +15,6 @@ <%= button_tag "Pause", :id => "ugoira-pause" %>
- <% if post.has_ugoira_webm? %> - <%= link_to "Save as video (right click and save)", post.tagged_large_file_url %> - <% else %> - WebM conversion pending - <% end %> + + <%= link_to "Save as video (right click and save)", post.tagged_large_file_url %>