commontator 6.0.0.pre.1 → 6.0.0.pre.2

data/app/views/commontator/comments/_body.html.erb

@@ -3,11 +3,4 @@
   comment
 %>
 
-<%=
-  commontator_simple_format(
-    comment.is_deleted? ? t(
-      'commontator.comment.status.deleted_by',
-      deleter_name: Commontator.commontator_name(comment.editor)
-    ) : comment.body
-  )
-%>
+<%= commontator_simple_format comment.body %>

data/app/views/commontator/comments/_form.html.erb

@@ -3,7 +3,6 @@
   # comment
   #
   # Optionally, they can also supply the following variables:
-  per_page ||= nil
   thread ||= nil
   no_remote ||= false
 %>
@@ -23,13 +22,11 @@
 <% end %>
 
 <%= form_for([commontator, thread, comment], remote: !no_remote) do |form| %>
-  <%= hidden_field_tag :per_page, per_page %>
-
   <%= form.hidden_field :parent_id %>
 
   <% unless comment.parent.nil? %>
     <div class="replying">
-      <%= t('commontator.comment.replying',
+      <%= t('commontator.comment.status.replying',
             creator_name: Commontator.commontator_name(comment.parent.creator)) %>
     </div>
   <% end %>

data/app/views/commontator/comments/_list.html.erb

@@ -1,11 +1,15 @@
 <%#
   Controllers that use this partial must supply the following variables:
-  comments
   user
-  per_page
+  nested_comments
 %>
 
-<% comments.includes(:creator, :editor).each do |comment| %>
-  <%= render partial: 'commontator/comments/show',
-             locals: { comment: comment, user: user, per_page: per_page } %>
+<% nested_comments.each do |comment, nested_children| %>
+  <div id="commontator-comment-<%= comment.id %>" class="comment">
+    <%=
+      render partial: 'commontator/comments/show', formats: [ :html ], locals: {
+        user: user, comment: comment, nested_children: nested_children
+      }
+    %>
+  </div>
 <% end %>

data/app/views/commontator/comments/_show.html.erb

@@ -1,54 +1,100 @@
-<%#
-  Controllers that use this partial must supply the following variables:
-  comment
-  user
-  per_page
-%>
+<%
+  # Controllers that use this partial must supply the following variables:
+  # user
+  # comment
+  # nested_children or page
+  # show_all
+
+  thread = comment.thread
+  nested_children ||= begin
+    children = thread.paginated_comments(page, comment.id, show_all)
+    thread.nested_comments_for(user, children, show_all)
+  end
 
-<% creator = comment.creator
-   name = Commontator.commontator_name(creator) || ''
-   link = Commontator.commontator_link(creator, main_app) || ''
-   avatar = Commontator.commontator_avatar(creator, self) || ''
+  creator = comment.creator
+  link = Commontator.commontator_link(creator, main_app)
+  name = Commontator.commontator_name(creator) || ''
 %>
 
-<div id="commontator-comment-<%= comment.id %>" class="comment">
-  <div id="commontator-comment-<%= comment.id %>-section-top" class="section top">
-    <span id="commontator-comment-<%= comment.id %>-author" class="author">
-      <%= link.blank? ? name : link_to(name, link) %>
-    </span>
+<div id="commontator-comment-<%= comment.id %>-section-top" class="section top">
+  <span id="commontator-comment-<%= comment.id %>-author" class="author">
+    <%= link.blank? ? name : link_to(name, link) %>
+  </span>
 
-    <span id="commontator-comment-<%= comment.id %>-actions" class="actions">
-      <%= render partial: 'commontator/comments/actions',
-                 locals: { comment: comment, user: user } %>
-    </span>
-  </div>
+  <span id="commontator-comment-<%= comment.id %>-actions" class="actions">
+    <%=
+      link_to(
+        t('commontator.comment.actions.edit'),
+        commontator.edit_comment_path(comment),
+        id: "commontator-comment-#{comment.id}-edit",
+        class: 'edit',
+        remote: true
+      ) if comment.can_be_edited_by?(user)
+    %>
 
-  <div id="commontator-comment-<%= comment.id %>-section-middle" class="section middle">
-    <span id="commontator-comment-<%= comment.id %>-avatar" class="avatar">
-      <%= avatar %>
-    </span>
+    <% if comment.can_be_deleted_by?(user) %>
+      <% is_deleted = comment.is_deleted? %>
+      <% del_string = is_deleted ? 'undelete' : 'delete' %>
+      <%= link_to t("commontator.comment.actions.#{del_string}"),
+                  commontator.polymorphic_path([del_string, comment]),
+                  data: is_deleted ? {} : { confirm: t('commontator.comment.actions.confirm_delete') },
+                  method: :put,
+                  id: "commontator-comment-#{comment.id}-#{del_string}",
+                  class: del_string,
+                  remote: true %>
+    <% end %>
+  </span>
+</div>
 
-    <span id="commontator-comment-<%= comment.id %>-votes" class="votes">
-      <%= render partial: 'commontator/comments/votes', locals: { comment: comment, user: user } %>
-    </span>
+<div id="commontator-comment-<%= comment.id %>-section-middle" class="section middle">
+  <span id="commontator-comment-<%= comment.id %>-avatar" class="avatar">
+    <%= Commontator.commontator_avatar(creator, self) %>
+  </span>
 
-    <div id="commontator-comment-<%= comment.id %>-body" class="body">
-      <%= render partial: 'commontator/comments/body', locals: { comment: comment } %>
-    </div>
+  <span id="commontator-comment-<%= comment.id %>-votes" class="votes">
+    <%= render partial: 'commontator/comments/votes', locals: { comment: comment, user: user } %>
+  </span>
+
+  <div id="commontator-comment-<%= comment.id %>-body" class="body">
+    <%= render partial: 'commontator/comments/body', locals: { comment: comment } %>
   </div>
+</div>
 
-  <div id="commontator-comment-<%= comment.id %>-section-bottom" class="section bottom">
+<div id="commontator-comment-<%= comment.id %>-section-bottom" class="section bottom">
+  <% unless comment.is_deleted? %>
     <span id="commontator-comment-<%= comment.id %>-reply" class="reply">
-      <%= render partial: 'commontator/comments/reply',
-                 locals: { comment: comment, user: user, per_page: per_page } %>
+      <%=
+        link_to(
+          t('commontator.comment.actions.reply'),
+          commontator.new_thread_comment_path(thread, comment: { parent_id: comment.id }),
+          remote: true
+        ) if thread.config.comment_reply_style != :n && !thread.is_closed?
+      %>
     </span>
+  <% end %>
 
-    <span id="commontator-comment-<%= comment.id %>-created-timestamp" class="timestamp">
-      <%= comment.created_timestamp %>
-    </span>
+  <span id="commontator-comment-<%= comment.id %>-created-timestamp" class="timestamp">
+    <%= comment.created_timestamp %>
+  </span>
 
-    <span id="commontator-comment-<%= comment.id %>-updated-timestamp" class="timestamp">
-      <%= comment.updated_timestamp if comment.is_modified? %>
-    </span>
+  <span id="commontator-comment-<%= comment.id %>-updated-timestamp" class="timestamp">
+    <%= comment.updated_timestamp if comment.is_modified? %>
+  </span>
+</div>
+
+<div id="commontator-comment-<%= comment.id %>-children" class="children">
+  <%= render partial: 'commontator/comments/list',
+             locals: { user: user, nested_comments: nested_children } %>
+</div>
+
+<div id="commontator-comment-<%= comment.id %>-pagination" class="pagination">
+  <div id="commontator-comment-<%= comment.id %>-will-paginate" class="will-paginate">
+    <%= will_paginate nested_children,
+                      renderer: Commontator::LinkRenderer,
+                      name: t('commontator.comment.status.reply_pages'),
+                      remote: true,
+                      params: { controller: 'commontator/comments',
+                                action: 'show',
+                                id: comment.id } %>
   </div>
 </div>

data/app/views/commontator/comments/_show.js.erb

@@ -0,0 +1,14 @@
+<%
+  # Views that use this partial must supply the following variables:
+  # user
+  # thread
+  # comment
+  # page
+  # show_all
+%>
+
+$("#commontator-comment-<%= comment.id %>").html("<%= escape_javascript(
+  render partial: 'commontator/comments/show', formats: [ :html ], locals: {
+    user: user, thread: thread, comment: comment, page: page, show_all: show_all
+  }
+) %>");

data/app/views/commontator/comments/_votes.html.erb

@@ -39,7 +39,7 @@
 
   <span id="commontator-comment-<%= comment.id %>-vote-count" class="vote-count">
     <% config = thread.config %>
-    <%= config.vote_count_proc.call(thread, comment.get_upvotes.size, comment.get_downvotes.size) %>
+    <%= config.vote_count_proc.call(thread, comment.cached_votes_up, comment.cached_votes_down) %>
   </span>
 
   <% if comment_voting == :ld %>

data/app/views/commontator/comments/create.js.erb

@@ -1,25 +1,30 @@
 <%=
-  render partial: 'commontator/threads/show', locals: {
-    thread: @commontator_thread,
+  if @comment.parent.nil?
+    partial = 'threads'
+    extra_locals = {}
+  else
+    partial = 'comments'
+    extra_locals = { comment: @comment.parent }
+  end
+
+  render partial: "commontator/#{partial}/show", locals: extra_locals.merge(
     user: @commontator_user,
-    per_page: @commontator_per_page,
-    page: @commontator_thread.new_comment_page(@commontator_per_page),
+    thread: @commontator_thread,
+    page: @commontator_page,
     show_all: @commontator_show_all
-  }
+  )
 %>
 
-<% unless @commontator_new_comment.nil? %>
+<% if @commontator_new_comment.nil? %>
+  $("#commontator-thread-<%= @commontator_thread.id %>-new-comment").hide();
+
+  $("#commontator-thread-<%= @commontator_thread.id %>-new-comment-link").fadeIn();
+<% else %>
   $("#commontator-thread-<%= @commontator_thread.id %>-new-comment").html("<%= escape_javascript(
     render partial: 'form', locals: {
-      comment: @commontator_new_comment,
-      thread: @commontator_thread,
-      per_page: @commontator_per_page
+      comment: @commontator_new_comment, thread: @commontator_thread
     }
   ) %>");
-<% else %>
-  $("#commontator-thread-<%= @commontator_thread.id %>-new-comment").hide();
-
-  $("#commontator-thread-<%= @commontator_thread.id %>-new-comment-link").fadeIn();
 <% end %>
 
 $("#commontator-comment-<%= @comment.id %>").hide().fadeIn()[0].scrollIntoView();

data/app/views/commontator/comments/delete.js.erb

@@ -1,17 +1,11 @@
-$("#commontator-comment-<%= @comment.id %>-body").html("<%= escape_javascript(
-  render partial: 'body', locals: { comment: @comment }
-) %>");
-
-$("#commontator-comment-<%= @comment.id %>-updated-timestamp").html("<%= escape_javascript(
-  @comment.updated_timestamp
-) %>");
-
-$("#commontator-comment-<%= @comment.id %>-actions").html("<%= escape_javascript(
-  render partial: 'actions', locals: { comment: @comment, user: @commontator_user }
-) %>");
-
-$("#commontator-comment-<%= @comment.id %>-votes").html("<%= escape_javascript(
-  render partial: 'votes', locals: { comment: @comment, user: @commontator_user }
-) %>");
+<%=
+  render partial: 'show', locals: {
+    user: @commontator_user,
+    thread: @commontator_thread,
+    comment: @comment,
+    page: @commontator_page,
+    show_all: @commontator_show_all
+  }
+%>
 
 <%= javascript_proc %>

data/app/views/commontator/comments/new.js.erb

@@ -1,12 +1,6 @@
 $("#commontator-thread-<%= @commontator_thread.id %>-new-comment").html("<%= escape_javascript(
-  render partial: 'form', locals: {
-    comment: @comment,
-    thread: @commontator_thread,
-    per_page: @commontator_per_page
-  }
-) %>");
-
-$("#commontator-thread-<%= @commontator_thread.id %>-new-comment").fadeIn()[0].scrollIntoView();
+  render partial: 'form', locals: { comment: @comment, thread: @commontator_thread }
+) %>").fadeIn()[0].scrollIntoView();
 
 $("#commontator-thread-<%= @commontator_thread.id %>-new-comment-link").hide();
 

data/app/views/commontator/comments/show.js.erb

@@ -0,0 +1,30 @@
+var commontatorOldCommentIds = $("#commontator-comment-<%=
+  @comment.id
+%>-children").children().map(function() {
+  return '#' + $(this).attr('id');
+}).toArray().join(',');
+
+<%=
+  render partial: 'show', locals: {
+    user: @commontator_user,
+    thread: @commontator_thread,
+    comment: @comment,
+    page: @commontator_page,
+    show_all: @commontator_show_all
+  }
+%>
+
+var commontatorOldComments = $(commontatorOldCommentIds);
+var commontatorNewComments = $("#commontator-comment-<%=
+  @comment.id
+%>-children").children().not(commontatorOldComments);
+
+commontatorNewComments.hide().fadeIn();
+
+if (commontatorOldComments.length > 0) {
+  commontatorOldComments[commontatorOldComments.length - 1].scrollIntoView();
+} else {
+  $("#commontator-comment-<%= @comment.id %>")[0].scrollIntoView();
+}
+
+<%= javascript_proc %>

data/app/views/commontator/comments/update.js.erb

@@ -1,9 +1,11 @@
-$("#commontator-comment-<%= @comment.id %>-body").html("<%= escape_javascript(
-  render partial: 'body', locals: { comment: @comment }
-) %>");
-
-$("#commontator-comment-<%= @comment.id %>-updated-timestamp").html("<%= escape_javascript(
-  @comment.updated_timestamp
-) %>");
+<%=
+  render partial: 'show', locals: {
+    user: @commontator_user,
+    thread: @commontator_thread,
+    comment: @comment,
+    page: @commontator_page,
+    show_all: @commontator_show_all
+  }
+%>
 
 <%= javascript_proc %>

data/app/views/commontator/shared/_thread.html.erb

@@ -2,7 +2,6 @@
   # Controllers that use this partial must supply the following variables:
   # thread
   # user
-  # per_page
   # page
   # show_all
   # Additionally, they may override the following variable:
@@ -14,18 +13,14 @@
     <% if @commontator_thread_show %>
       <%=
         render partial: 'commontator/threads/show', locals: {
-          thread: thread,
-          user: user,
-          page: page,
-          per_page: per_page,
-          show_all: show_all
+          thread: thread, user: user, page: page, show_all: show_all
         }
       %>
     <% else %>
       <% subscription = thread.subscription_for(user) %>
       <%= link_to "#{t 'commontator.thread.actions.show'} (#{
-                    (subscription.unread_comments.count.to_s + '/') if subscription
-                  }#{thread.filtered_comments.count.to_s})",
+                    (subscription.unread_comments(show_all).count.to_s + '/') if subscription
+                  }#{thread.filtered_comments(show_all).count.to_s})",
                   commontator.thread_path(thread),
                   remote: true %>
     <% end %>

data/app/views/commontator/threads/_reply.html.erb

@@ -2,7 +2,6 @@
   Views that use this partial must supply the following variables:
   thread
   user
-  per_page
 %>
 
 <div id="commontator-thread-<%= thread.id %>-reply" class="reply">
@@ -16,7 +15,7 @@
       <% unless @commontator_new_comment.nil? %>
         <%=
           render partial: 'commontator/comments/form', locals: {
-            comment: @commontator_new_comment, thread: thread, per_page: per_page
+            comment: @commontator_new_comment, thread: thread
           }
         %>
       <% end %>
@@ -25,7 +24,7 @@
     <% if @commontator_new_comment.nil? %>
       <div id="commontator-thread-<%= thread.id %>-new-comment-link" class="new-comment">
         <%= link_to t('commontator.comment.actions.new'),
-            commontator.new_thread_comment_path(thread, per_page: per_page),
+            commontator.new_thread_comment_path(thread),
             remote: true %>
       </div>
     <% end %>

data/app/views/commontator/threads/_show.html.erb

@@ -1,14 +1,15 @@
-<%#
-  Views that use this partial must supply the following variables:
-  thread
-  user
-  page
-  per_page
-  show_all
-%>
+<%
+  # Views that use this partial must supply the following variables:
+  # user
+  # thread
+  # page
+  # show_all
 
-<% can_subscribe = thread.can_subscribe?(user)
-   can_edit = thread.can_be_edited_by?(user) %>
+  can_subscribe = thread.can_subscribe?(user)
+  can_edit = thread.can_be_edited_by?(user)
+  comments = thread.paginated_comments(page, nil, show_all)
+  nested_comments = thread.nested_comments_for(user, comments, show_all)
+%>
 
 <div id="commontator-thread-<%= thread.id %>-show" class="show hidden">
   <%= link_to t('commontator.thread.actions.show'),
@@ -46,14 +47,14 @@
 
         <% if thread.is_filtered? %>
           <%= link_to t("commontator.thread.actions.#{filter_string}"),
-                      commontator.thread_url(thread, show_all: (show_all ? nil : true)),
+                      commontator.thread_path(thread, show_all: (show_all ? nil : true)),
                       id: "commontator-thread-#{thread.id}-#{filter_class}-link",
                       class: filter_class,
                       remote: true %>
         <% end %>
 
         <%= link_to t("commontator.thread.actions.#{close_string}"),
-                    commontator.polymorphic_url([close_string, thread]),
+                    commontator.polymorphic_path([close_string, thread]),
                     data: is_closed ? {} :
                                       { confirm: t('commontator.thread.actions.confirm_close') },
                     method: :put,
@@ -70,45 +71,41 @@
   </div>
 
   <% if thread.config.comment_order == :l %>
-    <%= render partial: 'commontator/threads/reply',
-               locals: { thread: thread, user: user, per_page: per_page } %>
+    <%= render partial: 'commontator/threads/reply', locals: { thread: thread, user: user } %>
   <% end %>
 
   <div id="commontator-thread-<%= thread.id %>-comment-list" class="comment-list">
-    <% comments = thread.paginated_comments(page, per_page, show_all) %>
-
-    <%= render partial: 'commontator/comments/list',
-               locals: { comments: comments, user: user, per_page: per_page } %>
+    <%=
+      render partial: 'commontator/comments/list', locals: {
+        user: user, nested_comments: nested_comments
+      }
+    %>
   </div>
 
-  <% if thread.will_paginate? %>
-    <div id="commontator-thread-<%= thread.id %>-pagination" class="pagination">
-      <div id="commontator-thread-<%= thread.id %>-page-entries-info" class="page-entries-info">
-        <%= page_entries_info comments,
-                              params: { controller: 'commontator/threads',
-                                        action: 'show',
-                                        id: thread.id,
-                                        page: page,
-                                        per_page: per_page } %>.
-      </div>
+  <div id="commontator-thread-<%= thread.id %>-pagination" class="pagination">
+    <div id="commontator-thread-<%= thread.id %>-page-entries-info" class="page-entries-info">
+      <%=
+        page_entries_info(comments) unless [ :i, :b ].include? thread.config.comment_reply_style
+      %>
+    </div>
 
-      <div id="commontator-thread-<%= thread.id %>-will-paginate" class="will-paginate">
-        <%= will_paginate comments,
-                          renderer: Commontator::LinkRenderer,
-                          routes_proxy: commontator,
-                          remote: true,
-                          params: { controller: 'commontator/threads',
-                                    action: 'show',
-                                    id: thread.id,
-                                    page: page,
-                                    per_page: per_page } %>
-      </div>
+    <div id="commontator-thread-<%= thread.id %>-will-paginate" class="will-paginate">
+      <%=
+        name = t('commontator.thread.status.pages') \
+          if [ :i, :b ].include?(thread.config.comment_reply_style)
+        will_paginate comments,
+                      renderer: Commontator::LinkRenderer,
+                      name: name,
+                      remote: true,
+                      params: { controller: 'commontator/threads',
+                                action: 'show',
+                                id: thread.id }
+      %>
     </div>
-  <% end %>
+  </div>
 
   <% if thread.config.comment_order != :l %>
-    <%= render partial: 'commontator/threads/reply',
-               locals: { thread: thread, user: user, per_page: per_page } %>
+    <%= render partial: 'commontator/threads/reply', locals: { thread: thread, user: user } %>
   <% end %>
 </div>