Kill trailing whitespace in ruby files
This commit is contained in:
@@ -3,18 +3,18 @@ class PostPresenter < Presenter
|
||||
if post.is_deleted? && !CurrentUser.is_privileged?
|
||||
return ""
|
||||
end
|
||||
|
||||
|
||||
unless Danbooru.config.can_user_see_post?(CurrentUser.user, post)
|
||||
return ""
|
||||
end
|
||||
|
||||
|
||||
flags = []
|
||||
flags << "pending" if post.is_pending?
|
||||
flags << "flagged" if post.is_flagged?
|
||||
flags << "deleted" if post.is_deleted?
|
||||
|
||||
|
||||
path = options[:path_prefix] || "/posts"
|
||||
|
||||
|
||||
html = %{<article class="post-preview" id="post_#{post.id}" data-id="#{post.id}" data-tags="#{h(post.tag_string)}" data-uploader="#{h(post.uploader_name)}" data-rating="#{post.rating}" data-width="#{post.image_width}" data-height="#{post.image_height}" data-flags="#{flags.join(' ')}" data-parent-id="#{post.parent_id}" data-has-children="#{post.has_children?}" data-score="#{post.score}">}
|
||||
if options[:tags].present?
|
||||
tag_param = "?tags=#{CGI::escape(options[:tags])}"
|
||||
@@ -29,43 +29,43 @@ class PostPresenter < Presenter
|
||||
html << %{</article>}
|
||||
html.html_safe
|
||||
end
|
||||
|
||||
|
||||
def initialize(post)
|
||||
@post = post
|
||||
end
|
||||
|
||||
|
||||
def preview_html
|
||||
PostPresenter.preview(@post)
|
||||
end
|
||||
|
||||
|
||||
def humanized_tag_string
|
||||
@post.tag_string.split(/ /).slice(0, 25).join(", ").tr("_", " ")
|
||||
end
|
||||
|
||||
|
||||
def humanized_essential_tag_string
|
||||
string = []
|
||||
|
||||
|
||||
if @post.character_tags.any?
|
||||
string << @post.character_tags.slice(0, 5).to_sentence
|
||||
end
|
||||
|
||||
|
||||
if @post.copyright_tags.any?
|
||||
string << "from"
|
||||
string << @post.copyright_tags.slice(0, 5).to_sentence
|
||||
end
|
||||
|
||||
|
||||
if @post.artist_tags.any?
|
||||
string << "drawn by"
|
||||
string << @post.artist_tags.to_sentence
|
||||
end
|
||||
|
||||
|
||||
string.join(" ").tr("_", " ")
|
||||
end
|
||||
|
||||
|
||||
def image_html(template)
|
||||
return template.content_tag("p", "This image was deleted.") if @post.is_deleted? && !CurrentUser.user.is_privileged?
|
||||
return template.content_tag("p", "You need a privileged account to see this image.") if !Danbooru.config.can_user_see_post?(CurrentUser.user, @post)
|
||||
|
||||
|
||||
if @post.is_flash?
|
||||
template.render("posts/partials/show/flash", :post => @post)
|
||||
elsif !@post.is_image?
|
||||
@@ -74,21 +74,21 @@ class PostPresenter < Presenter
|
||||
template.render("posts/partials/show/image", :post => @post)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def tag_list_html(template, options = {})
|
||||
@tag_set_presenter ||= TagSetPresenter.new(@post.tag_array)
|
||||
@tag_set_presenter.tag_list_html(template, options.merge(:show_extra_links => CurrentUser.user.is_privileged?))
|
||||
end
|
||||
|
||||
|
||||
def split_tag_list_html(template, options = {})
|
||||
@tag_set_presenter ||= TagSetPresenter.new(@post.tag_array)
|
||||
@tag_set_presenter.split_tag_list_html(template, options.merge(:show_extra_links => CurrentUser.user.is_privileged?))
|
||||
end
|
||||
|
||||
|
||||
def has_nav_links?(template)
|
||||
(CurrentUser.user.enable_sequential_post_navigation && template.params[:tags].present? && template.params[:tags] !~ /order:/) || @post.pools.active.any?
|
||||
end
|
||||
|
||||
|
||||
def post_footer_for_pool_html(template)
|
||||
if template.params[:pool_id]
|
||||
pool = Pool.where(:id => template.params[:pool_id]).first
|
||||
@@ -99,15 +99,15 @@ class PostPresenter < Presenter
|
||||
nil
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def pool_html(template)
|
||||
html = ["<ul>"]
|
||||
|
||||
|
||||
if template.params[:pool_id].present?
|
||||
pool = Pool.where(:id => template.params[:pool_id]).first
|
||||
return if pool.nil?
|
||||
html += pool_link_html(template, pool, :include_rel => true)
|
||||
|
||||
|
||||
@post.pools.active.where("id <> ?", template.params[:pool_id]).each do |other_pool|
|
||||
html += pool_link_html(template, other_pool)
|
||||
end
|
||||
@@ -122,15 +122,15 @@ class PostPresenter < Presenter
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
html << "</ul>"
|
||||
html.join("\n").html_safe
|
||||
end
|
||||
|
||||
|
||||
def pool_link_html(template, pool, options = {})
|
||||
pool_html = ["<li>"]
|
||||
match_found = false
|
||||
|
||||
|
||||
if options[:include_rel]
|
||||
prev_rel = "prev"
|
||||
next_rel = "next"
|
||||
@@ -140,14 +140,14 @@ class PostPresenter < Presenter
|
||||
next_rel = nil
|
||||
klass = ""
|
||||
end
|
||||
|
||||
|
||||
if pool.neighbors(@post).previous
|
||||
pool_html << template.link_to("«prev".html_safe, template.post_path(pool.neighbors(@post).previous, :pool_id => pool.id), :rel => prev_rel, :class => "#{klass} prev")
|
||||
match_found = true
|
||||
else
|
||||
pool_html << '<span class="prev">«prev</span>'
|
||||
end
|
||||
|
||||
|
||||
pool_html << ' <span class="pool-name ' + klass + '">'
|
||||
pool_html << template.link_to("Pool: #{pool.pretty_name}", template.pool_path(pool))
|
||||
pool_html << '</span> '
|
||||
@@ -158,7 +158,7 @@ class PostPresenter < Presenter
|
||||
else
|
||||
pool_html << '<span class="next">next»</span>'
|
||||
end
|
||||
|
||||
|
||||
pool_html << "</li>"
|
||||
pool_html
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user