diff --git a/app/assets/javascripts/comments.js b/app/assets/javascripts/comments.js index 0d942f1df..1717dff17 100644 --- a/app/assets/javascripts/comments.js +++ b/app/assets/javascripts/comments.js @@ -53,8 +53,9 @@ e.preventDefault(); } - Danbooru.Comment.initialize_reply_links = function() { - $(".reply-link").click(Danbooru.Comment.quote); + Danbooru.Comment.initialize_reply_links = function($parent) { + $parent = $parent || $(document); + $parent.find(".reply-link").click(Danbooru.Comment.quote); } Danbooru.Comment.initialize_expand_links = function() { @@ -79,9 +80,10 @@ $("div.new-comment form").hide(); } - Danbooru.Comment.initialize_edit_links = function() { - $(".edit_comment").hide(); - $(".edit_comment_link").click(function(e) { + Danbooru.Comment.initialize_edit_links = function($parent) { + $parent = $parent || $(document); + $parent.find(".edit_comment").hide(); + $parent.find(".edit_comment_link").click(function(e) { var link_id = $(this).attr("id"); var comment_id = link_id.match(/^edit_comment_link_(\d+)$/)[1]; $("#edit_comment_" + comment_id).fadeToggle("fast"); @@ -111,8 +113,9 @@ }); } - Danbooru.Comment.initialize_vote_links = function() { - $(".unvote-comment-link").hide(); + Danbooru.Comment.initialize_vote_links = function($parent) { + $parent = $parent || $(document); + $parent.find(".unvote-comment-link").hide(); } })(); diff --git a/app/assets/javascripts/dtext.js b/app/assets/javascripts/dtext.js index 8b7b13428..94b79b502 100644 --- a/app/assets/javascripts/dtext.js +++ b/app/assets/javascripts/dtext.js @@ -3,7 +3,7 @@ Danbooru.Dtext.initialize_all = function() { Danbooru.Dtext.initialize_links(); - Danbooru.Dtext.initialize_expandables($(document)); + Danbooru.Dtext.initialize_expandables(); } Danbooru.Dtext.initialize_links = function() { @@ -12,6 +12,7 @@ } Danbooru.Dtext.initialize_expandables = function($parent) { + $parent = $parent || $(document); $parent.find(".expandable-content").hide(); $parent.find(".expandable-button").click(function(e) { var button = $(this); diff --git a/app/views/comments/index_for_post.js.erb b/app/views/comments/index_for_post.js.erb index 5d86bd4dd..e0fcc5abf 100644 --- a/app/views/comments/index_for_post.js.erb +++ b/app/views/comments/index_for_post.js.erb @@ -1,6 +1,7 @@ $("#hidden-comments-notice-for-<%= @post.id %>").hide(); -$("div.comments-for-post[data-post-id=<%= @post.id %>] div.list-of-comments").html("<%= j(render(:partial => 'comments/partials/show/comment', :collection => @comments))%>"); +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))%>"); <% if params[:include_below_threshold] %> $("#threshold-comments-notice-for-<%= @post.id %>").hide(); @@ -9,7 +10,7 @@ $("div.comments-for-post[data-post-id=<%= @post.id %>] div.list-of-comments").ht Danbooru.Comment.hide_threshold_comments(<%= @post.id %>); <% end %> -Danbooru.Comment.initialize_reply_links(); -Danbooru.Comment.initialize_edit_links(); -Danbooru.Comment.initialize_vote_links(); -Danbooru.Dtext.initialize_expandables($(document)); +Danbooru.Comment.initialize_reply_links(current_comment_section); +Danbooru.Comment.initialize_edit_links(current_comment_section); +Danbooru.Comment.initialize_vote_links(current_comment_section); +Danbooru.Dtext.initialize_expandables(current_comment_section);