commontator 6.0.1 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 493bb858e4b65e4edeb26a496fe56b93d9119ffd2555097af8ab84a016aa29a9
-  data.tar.gz: f6dd0195a93216cc8900c10de23e2055f4eb539cebd86410970f58b4f4724795
+  metadata.gz: c63a6212f25d57ea206e1cfb23f4c8dff604ce26f6fb1a5d1ddb0088b030a4a5
+  data.tar.gz: 23ecd8f13e5af29e8968882361b2e87506d80ac23a209e4116c638a63514f46e
 SHA512:
-  metadata.gz: 0b7e38a1081300cdf9ed8c711b295d0fc8494a0cafddb5c2f03f96a4041770edef63d1a11e4e74046c3f23e6cb51f770d26b224ea8c597da4b021f706ff7932b
-  data.tar.gz: 033432442ad4e7f81d382398e0e37eeea3bcd46c54e627ecef298e435c3f186244e264cebc300527e727b365b9a82e1769e1d782571535668499448f8459e18d
+  metadata.gz: 04c523c45acc09a1062fbeeefbe1e328ee439b7f929f9fdb5d00a7d510d547434d2648cfbb1326d6ad0e7c182d91e2c745839434ac948af297fce964cb2c0724
+  data.tar.gz: 64b8731da68531908d2230936f21d647a5b2567d044490ebdbce8d85aa2dcdddff84ae68f31bd88b282df59f5ca7df19d2bf9d657a644715a0f6324c3e8ae548

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

@@ -1,9 +1,12 @@
 <%
-  # Views that use this partial must provide the following variables:
+  # Views that use this partial must provide the following variable:
   # comment
   #
+
+  new_record = comment.new_record?
+
   # Optionally, they can also supply the following variables:
-  thread ||= nil
+  thread ||= new_record ? comment.thread : nil
   no_remote ||= false
 %>
 
@@ -11,7 +14,7 @@
 
 <% if comment.errors.any? %>
   <div class="error-explanation">
-    <h3><%= t "commontator.comment.errors.#{comment.id.blank? ? 'create' : 'update'}" %></h3>
+    <h3><%= t "commontator.comment.errors.#{new_record ? 'create' : 'update'}" %></h3>
 
     <ul>
       <% comment.errors.full_messages.each do |msg| %>
@@ -33,15 +36,20 @@
 
   <div class="field">
     <%=
-      form.text_area :body, rows: '7', id: comment.id.blank? ?
-        "commontator-thread-#{@commontator_thread.id}-new-comment-body" :
+      form.text_area :body, rows: '7', id: new_record ?
+        comment.parent.nil? ? "commontator-thread-#{@commontator_thread.id}-new-comment-body" :
+                              "commontator-comment-#{comment.parent.id}-reply" :
         "commontator-comment-#{comment.id}-edit-body"
     %>
     <%= javascript_tag('Commontator.initMentions();') if config.mentions_enabled %>
   </div>
 
   <div class="submit">
-    <%= form.submit t("commontator.comment.actions.#{comment.id.blank? ? 'create' : 'update'}") %>
-    <%= form.submit t('commontator.comment.actions.cancel'), name: 'cancel' %>
+    <%= form.submit t("commontator.comment.actions.#{new_record ? 'create' : 'update'}") %>
+    <%=
+      form.submit(
+        t('commontator.comment.actions.cancel'), name: 'cancel'
+      ) unless config.new_comment_style == :t && new_record && comment.parent.nil?
+    %>
   </div>
 <% end %>

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

@@ -62,7 +62,7 @@
 
 <div id="commontator-comment-<%= comment.id %>-section-bottom" class="section bottom">
   <% unless comment.is_deleted? %>
-    <span id="commontator-comment-<%= comment.id %>-reply" class="reply">
+    <span id="commontator-comment-<%= comment.id %>-reply-link" class="reply">
       <%=
         link_to(
           t('commontator.comment.actions.reply'),
@@ -83,8 +83,16 @@
 </div>
 
 <div id="commontator-comment-<%= comment.id %>-children" class="children">
+  <% if thread.config.comment_order == :l %>
+    <div id="commontator-comment-<%= comment.id %>-reply" class="reply"></div>
+  <% end %>
+
   <%= render partial: 'commontator/comments/list',
              locals: { user: user, nested_comments: nested_children } %>
+
+  <% if thread.config.comment_order != :l %>
+    <div id="commontator-comment-<%= comment.id %>-reply" class="reply"></div>
+  <% end %>
 </div>
 
 <div id="commontator-comment-<%= comment.id %>-pagination" class="pagination">

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

@@ -1,7 +1,13 @@
-<% if @comment.nil? || !@comment.persisted? %>
-  $("#commontator-thread-<%= @commontator_thread.id %>-new-comment").hide();
+<% if @comment.nil? || @comment.new_record? %>
+  <%
+    id = @comment.nil? || @comment.parent.nil? ?
+      "commontator-thread-#{@commontator_thread.id}-new-comment" :
+      "commontator-comment-#{@comment.parent.id}-reply"
+  %>
 
-  $("#commontator-thread-<%= @commontator_thread.id %>-new-comment-link").fadeIn();
+  $("#<%= id %>").hide();
+
+  $("#<%= id %>-link").fadeIn();
 <% else %>
   $("#commontator-comment-<%= @comment.id %>-body").html("<%= escape_javascript(
     render partial: 'body', locals: { comment: @comment }

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

@@ -2,9 +2,11 @@
   if @comment.parent.nil?
     partial = 'threads'
     extra_locals = {}
+    id = "commontator-thread-#{@commontator_thread.id}-new-comment"
   else
     partial = 'comments'
     extra_locals = { comment: @comment.parent }
+    id = "commontator-comment-#{@comment.parent.id}-reply"
   end
 
   render partial: "commontator/#{partial}/show", locals: extra_locals.merge(
@@ -16,17 +18,20 @@
 %>
 
 <% if @commontator_new_comment.nil? %>
-  $("#commontator-thread-<%= @commontator_thread.id %>-new-comment").hide();
+  $("#<%= id %>").hide();
 
-  $("#commontator-thread-<%= @commontator_thread.id %>-new-comment-link").fadeIn();
+  $("#<%= id %>-link").fadeIn();
 <% else %>
-  $("#commontator-thread-<%= @commontator_thread.id %>-new-comment").html("<%= escape_javascript(
+  $("#<%= id %>").html("<%= escape_javascript(
     render partial: 'form', locals: {
       comment: @commontator_new_comment, thread: @commontator_thread
     }
   ) %>");
 <% end %>
 
-$("#commontator-comment-<%= @comment.id %>").hide().fadeIn()[0].scrollIntoView();
+var commontatorComment = $("#commontator-comment-<%= @comment.id %>").hide().fadeIn();
+$('html, body').animate(
+  { scrollTop: commontatorComment.offset().top - window.innerHeight/2 }, 'fast'
+);
 
 <%= javascript_proc %>

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

@@ -1,9 +1,15 @@
-$("#commontator-thread-<%= @commontator_thread.id %>-new-comment").html("<%= escape_javascript(
+<%
+  id = @comment.parent.nil? ? "commontator-thread-#{@commontator_thread.id}-new-comment" :
+                              "commontator-comment-#{@comment.parent.id}-reply"
+%>
+
+var commontatorForm = $("#<%= id %>").html("<%= escape_javascript(
   render partial: 'form', locals: { comment: @comment, thread: @commontator_thread }
-) %>").fadeIn()[0].scrollIntoView();
+) %>").hide().fadeIn();
+$('html, body').animate({ scrollTop: commontatorForm.offset().top - window.innerHeight/2 }, 'fast');
 
-$("#commontator-thread-<%= @commontator_thread.id %>-new-comment-link").hide();
+$("#<%= id %>-link").hide();
 
-$('#commontator-thread-<%= @commontator_thread.id %>-new-comment-body').focus();
+$('#<%= id %>-body').focus();
 
 <%= javascript_proc %>

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

@@ -14,17 +14,11 @@ var commontatorOldCommentIds = $("#commontator-comment-<%=
   }
 %>
 
-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();
-}
+%>-children").children().not(commontatorOldCommentIds).hide().fadeIn();
+$('html, body').animate(
+  { scrollTop: commontatorNewComments.offset().top - window.innerHeight/2 }, 'fast'
+);
 
 <%= javascript_proc %>

data/app/views/commontator/threads/_hide_show_links.js.erb

@@ -6,11 +6,17 @@
 $("#commontator-thread-<%= thread.id %>-hide-link").click(function() {
   $("#commontator-thread-<%= thread.id %>-content").hide();
 
-  $("#commontator-thread-<%= thread.id %>-show").fadeIn()[0].scrollIntoView();
+  var commontatorLink = $("#commontator-thread-<%= thread.id %>-show").fadeIn();
+  $('html, body').animate(
+    { scrollTop: commontatorLink.offset().top - window.innerHeight/2 }, 'fast'
+  );
 });
 
 $("#commontator-thread-<%= thread.id %>-show-link").click(function() {
-  $("#commontator-thread-<%= thread.id %>-content").fadeIn()[0].scrollIntoView();
+  var commontatorThread = $("#commontator-thread-<%= thread.id %>-content").fadeIn();
+  $('html, body').animate(
+    { scrollTop: commontatorThread.offset().top - window.innerHeight/2 }, 'fast'
+  );
 
   $("#commontator-thread-<%= thread.id %>-show").hide();
 });

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

@@ -10,6 +10,14 @@
   <% elsif !user %>
     <p><%= t 'commontator.require_login' %>.</p>
   <% else %>
+    <% 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),
+            remote: true %>
+      </div>
+    <% end %>
+
     <div id="commontator-thread-<%= thread.id %>-new-comment" class="new-comment<%=
     @commontator_new_comment.nil? ? ' hidden' : '' %>">
       <% unless @commontator_new_comment.nil? %>
@@ -20,13 +28,5 @@
         %>
       <% end %>
     </div>
-
-    <% 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),
-            remote: true %>
-      </div>
-    <% end %>
   <% end %>
 </div>

data/config/initializers/commontator.rb

@@ -210,9 +210,7 @@ Commontator.configure do |config|
   # How to display the "new comment" form
   # Valid options:
   #   :t (always present in the thread's page)
-  #   :l (link to the form; opens in the same page using JS)
-  # Not yet implemented:
-  #   :n (link to the form; opens in a new window)
+  #   :l (link to the form, which appears in the same location the new comment will appear)
   # Default: :l
   config.new_comment_style = :l
 

data/lib/commontator/version.rb

@@ -1 +1 @@
-COMMONTATOR_VERSION = '6.0.1'
+COMMONTATOR_VERSION = '6.1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commontator
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.1.0
 platform: ruby
 authors:
 - Dante Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails