Download as
Browse Code »

Commit f36e48437d77e70f03424ab9dada77a57d65d5b9

Authored by Rodrigo Souto
1 parent ef4cb47f
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fixing comments counter 

Fixing the js method and also correcting the controller orders to
calculate the total count.
Showing 2 changed files with 8 additions and 8 deletions   Show diff stats
app/controllers/public/content_viewer_controller.rb
  Diff comments   View file @f36e484
... ... @@ -100,9 +100,9 @@ class ContentViewerController < ApplicationController
100 100 end
101 101  
102 102 @comments = @page.comments.without_spam
  103 + @comments = @plugins.filter(:unavailable_comments, @comments)
103 104 @comments_count = @comments.count
104   - @comments = @plugins.filter(:unavailable_comments, @comments.without_reply)
105   - @comments = @comments.paginate(:per_page => per_page, :page => params[:comment_page] )
  105 + @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
106 106  
107 107 if params[:slideshow]
108 108 render :action => 'slideshow', :layout => 'slideshow'
... ...
public/javascripts/comment_form.js
  Diff comments   View file @f36e484
... ... @@ -54,7 +54,7 @@ function save_comment(button) {
54 54 $('#'+ data.render_target).replaceWith(data.html);
55 55 $('#' + data.render_target).effect("highlight", {}, 3000);
56 56 $.colorbox.close();
57   - update_comment_count();
  57 + increment_comment_count(comment_div);
58 58 } else {
59 59 //New comment of article
60 60 comment_div.find('.article-comments-list').append(data.html);
... ... @@ -65,9 +65,10 @@ function save_comment(button) {
65 65  
66 66 page_comment_form.find('.errorExplanation').remove();
67 67 $.colorbox.close();
68   - update_comment_count();
  68 + increment_comment_count(comment_div);
69 69 }
70 70  
  71 +
71 72 if(jQuery('#recaptcha_response_field').val()){
72 73 Recaptcha.reload();
73 74 }
... ... @@ -83,12 +84,11 @@ function save_comment(button) {
83 84 }, 'json');
84 85 }
85 86  
86   -function update_comment_count() {
  87 +function increment_comment_count(comment_div) {
87 88 comment_div.find('.comment-count').add('#article-header .comment-count').each(function() {
88   - var count = parseInt($(this).html());
89   - update_comment_count($(this), count + 1);
  89 + var count = parseInt(jQuery(this).html());
  90 + update_comment_count(jQuery(this), count + 1);
90 91 });
91   -
92 92 }
93 93  
94 94 function show_display_comment_button() {
... ...