Download as
Browse Code »

Commit d570dc448c7d2138fbce861371142a4f74414666

Authored by Antonio Terceiro
1 parent c03afdf0
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

Properly update UI after comment removal/spam mark 

ActionItem2306
Showing 3 changed files with 15 additions and 3 deletions   Show diff stats
app/helpers/content_viewer_helper.rb
  Diff comments   View file @d570dc4
... ... @@ -8,7 +8,7 @@ module ContentViewerHelper
8 8 if n == 0
9 9 _('No comments yet')
10 10 else
11   - n_('One comment', '%{comments} comments', n) % { :comments => n }
  11 + n_('One comment', '<span class="comment-count">%{comments}</span> comments', n) % { :comments => n }
12 12 end
13 13 end
14 14  
... ...
app/views/content_viewer/_comment.rhtml
  Diff comments   View file @d570dc4
... ... @@ -65,7 +65,7 @@
65 65  
66 66 <% if logged_in? && (user == profile || user == comment.author || user.has_permission?(:moderate_comments, profile)) %>
67 67 &nbsp;
68   - <%= link_to_function(_('Remove'), 'remove_comment(this, %s, %s); return false ;' % [url_for(:profile => params[:profile], :remove_comment => comment.id, :view => params[:view]).to_json, _('Are you sure you want to remove this comment and all its replies?').to_json], :class => 'comment-footer comment-footer-link comment-footer-hide') %>
  68 + <%= link_to_function(_('Remove'), 'remove_comment(this, %s, %s); return false ;' % [url_for(:profile => params[:profile], :remove_comment => comment.id, :view => params[:view]).to_json, _('Are you sure you want to remove this comment and all its replies?').to_json], :class => 'comment-footer comment-footer-link comment-footer-hide remove-children') %>
69 69 <% end %>
70 70  
71 71 <% unless comment.spam? %>
... ...
public/javascripts/application.js
  Diff comments   View file @d570dc4
... ... @@ -693,7 +693,19 @@ function remove_comment(button, url, msg) {
693 693 $button.addClass('comment-button-loading');
694 694 $.post(url, function(data) {
695 695 if (data.ok) {
696   - $button.closest('.article-comment').slideUp();
  696 + var $comment = $button.closest('.article-comment');
  697 + var $replies = $comment.find('.comment-replies .article-comment');
  698 + $comment.slideUp();
  699 + var comments_removed = 1;
  700 + if ($button.hasClass('remove-children')) {
  701 + comments_removed = 1 + $replies.size();
  702 + } else {
  703 + $replies.appendTo('.article-comments-list');
  704 + }
  705 + $('.comment-count').each(function() {
  706 + var count = parseInt($(this).html());
  707 + $(this).html(count - comments_removed);
  708 + });
697 709 }
698 710 });
699 711 }
... ...