jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

comments.js: fix thresholded comments.

Browse Source 
* Restore behavior of thresholded comments being greyed out (lost in 6fa0ae2cf).

* Set the `below-threshold` class for thresholded comments in the html instead of in javascript.

* Remove `include_below_threshold` param; it was always true when clicking "Show all comments".
This commit is contained in:
evazion
2018-08-09 12:41:15 -05:00
parent 031cb6b8cf
commit 130570aa33
6 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/comments_controller.rb
View File

@@ -70,7 +70,6 @@ private
def index_for_post
@post = Post.find(params[:post_id])
@comments = @post.comments
@comments = @comments.visible(CurrentUser.user) unless params[:include_below_threshold]
render :action => "index_for_post"
end

23
app/javascript/src/javascripts/comments.js
View File

@@ -11,16 +11,8 @@ Comment.initialize_all = function() {
this.initialize_expand_links();
}
if ($("#c-posts").length && $("#a-show").length) {
Comment.highlight_threshold_comments(Utility.meta("post-id"));
}
$(window).on("danbooru:index_for_post", (_event, post_id, current_comment_section, include_below_threshold) => {
if (include_below_threshold) {
$("#threshold-comments-notice-for-" + post_id).hide();
} else {
Comment.highlight_threshold_comments(post_id);
}
$(window).on("danbooru:index_for_post", (_event, post_id, current_comment_section) => {
$("#threshold-comments-notice-for-" + post_id).hide();
Dtext.initialize_expandables(current_comment_section);
});
}
@@ -67,17 +59,6 @@ Comment.show_edit_form = function(e) {
e.preventDefault();
}
Comment.highlight_threshold_comments = function(post_id) {
var threshold = parseInt(Utility.meta("user-comment-threshold"));
var articles = $("article.comment[data-post-id=" + post_id + "]");
articles.each(function(i, v) {
var $comment = $(v);
if (parseInt($comment.data("score")) < threshold) {
$comment.addClass("below-threshold");
}
});
}
Comment.hide_threshold_comments = function(post_id) {
var threshold = parseInt(Utility.meta("user-comment-threshold"));
var articles = $("article.comment[data-post-id=" + post_id + "]");

4
app/models/comment.rb
View File

@@ -189,6 +189,10 @@ class Comment < ApplicationRecord
true
end
def below_threshold?(user = CurrentUser.user)
score < user.comment_threshold
end
def editable_by?(user)
creator_id == user.id || user.is_moderator?
end

2
app/views/comments/index_for_post.js.erb
View File

@@ -2,4 +2,4 @@ $("#hidden-comments-notice-for-<%= @post.id %>").hide();
var current_comment_section = $("div.comments-for-post[data-post-id=<%= @post.id %>] div.list-of-comments");
current_comment_section.html("<%= j(render(:partial => 'comments/partials/show/comment', :collection => @comments))%>");
$(window).trigger("danbooru:index_for_post", [<%= @post.id %>, current_comment_section, <%= ActiveModel::Type::Boolean.new.cast(params[:include_below_threshold]) %>]);
$(window).trigger("danbooru:index_for_post", [<%= @post.id %>, current_comment_section]);

2
app/views/comments/partials/index/_list.html.erb
View File

@@ -6,7 +6,7 @@
<div class="row notices">
<% if post.comments.hidden(CurrentUser.user).count > 0 || (params[:controller] == "comments" && post.comments.count > 6) %>
<span class="info" id="threshold-comments-notice-for-<%= post.id %>">
<%= link_to "Show all comments", comments_path(:post_id => post.id, :include_below_threshold => true), :remote => true %>
<%= link_to "Show all comments", comments_path(:post_id => post.id), :remote => true %>
</span>
<% end %>
</div>

2
app/views/comments/partials/show/_comment.html.erb
View File

@@ -1,6 +1,6 @@
<% if CurrentUser.is_moderator? || (params[:search] && params[:search][:is_deleted] =~ /t/) || !comment.is_deleted? %>
<a name="comment-<%= comment.id %>"></a>
<article class="comment" data-post-id="<%= comment.post_id %>" data-comment-id="<%= comment.id %>" data-score="<%= comment.score %>" data-creator="<%= comment.creator_name %>" data-is-sticky="<%= comment.is_sticky %>">
<article class="comment <%= "below-threshold" if comment.below_threshold? %>" data-post-id="<%= comment.post_id %>" data-comment-id="<%= comment.id %>" data-score="<%= comment.score %>" data-creator="<%= comment.creator_name %>" data-is-sticky="<%= comment.is_sticky %>">
<div class="author">
<h1>
<%= link_to_user comment.creator %>