From d383f049f5dbb774848ba16a961cb9d17cd053b7 Mon Sep 17 00:00:00 2001
From: Will Gutierrez <will.gutierrez@gmail.com>
Date: Wed, 10 Feb 2021 16:06:38 -0800
Subject: [PATCH 1/6] merge comments/_edit & comments/_form partials

---
 app/views/comments/_edit.html.erb | 104 -----------------
 app/views/comments/_form.html.erb | 187 +++++++++++++++++++++---------
 2 files changed, 131 insertions(+), 160 deletions(-)
 delete mode 100644 app/views/comments/_edit.html.erb

diff --git a/app/views/comments/_edit.html.erb b/app/views/comments/_edit.html.erb
deleted file mode 100644
index 588f03495d..0000000000
--- a/app/views/comments/_edit.html.erb
+++ /dev/null
@@ -1,104 +0,0 @@
-<div id="edit-comment-form-wrapper-<%= comment.id %>" class="card card-body bg-light comment-form-wrapper" style="display: none;">
-  <form 
-    method="post" 
-    id="comment-form-edit-<%= comment.id %>" 
-    style="display: none;" 
-    class="well" 
-    <% if comment.is_a?Answer %>
-      action= "/answers/update/<%= comment.id %>" 
-    <% else %>
-      action="/comment/update/<%= comment.id %>"
-    <% end %>
-  >
-    <h4 style="margin-top:0;"><%= title %></h4>
-    <input type="hidden" name="authenticity_token" value="<%= form_authenticity_token %>">
-    <style>
-      .imagebar {width:100%;}
-    </style>
-    <!-- toolbar needs location & comment_id to make unique element IDs -->
-    <%= render :partial => "editor/toolbar", :locals => { :comment_id => comment.id.to_s, :location => :edit } %>
-    <div id="comment-form-body-edit-<%= comment.id%>" class="form-group dropzone dropzone-large" data-form-id="edit-<%= comment.id %>">
-      <textarea 
-        id="text-input-edit-<%= comment.id%>" 
-        class="form-control text-input" 
-        name="body" 
-        data-form-id="edit-<%= comment.id %>"
-        onFocus="editing=true" 
-        aria-label="Edit Comment" 
-        rows="6" 
-        cols="40" 
-        placeholder="<%= placeholder %>"
-      ><%= !(comment.is_a?Answer) ? comment.comment : comment.content %></textarea>
-      <div class="imagebar">
-        <div 
-          id="image-upload-progress-container-edit-<%= comment.id %>" style="display: none;" 
-          class="progress progress-bar-container active pull-right"
-        >
-          <div 
-            id="image-upload-progress-bar-edit-<%= comment.id %>" 
-            class="progress-bar progress-bar-striped progress-bar-animated" style="width: 0%;"
-          >
-          </div>
-        </div>
-        <p>
-        <span 
-          id="image-upload-text-edit-<%= comment.id %>" 
-          class="uploading uploading-text" 
-          style="display:none;"
-        >
-          <%= translation('comments._edit.uploading') %>
-        </span>
-        <span id="choose-one-edit-<%= comment.id%>" class="prompt choose-one-prompt-text">
-          <span style="padding-right:4px;float:left;" class="hidden-xs">
-            <%= raw translation('comments._edit.drag_and_drop') %>
-          </span>
-          <label id="c<%= comment.id%>input_label" for="fileinput-choose-one-edit-<%= comment.id%>">
-            <input id="fileinput-choose-one-edit-<%= comment.id%>" type="file" name="image[photo]" style="display:none;" />
-            <a class="hidden-xs"><%= translation('comments._edit.choose_one') %></a>
-            <span class="visible-xs">
-              <i class="fa fa-upload"></i>
-              <a><%= translation('comments._edit.upload_image') %></a>
-            </span>
-          </label>
-        </span>
-        </p>
-      </div>
-    </div>
-    <div class="comment-preview well col-md-11" id="comment-preview-edit-<%= comment.id %>" style="background: white; display: none">
-    </div>
-    <div class="control-group">
-      <button type="submit" class="btn btn-primary"><%= translation('comments._edit.publish') %></button>
-        <a 
-          class="btn btn-default preview-btn" 
-          id="toggle-preview-button-edit-<%= comment.id %>"  
-          data-previewing-text="Hide Preview" 
-          onClick="
-            $E.setState('edit-<%= comment.id %>');
-            $E.toggle_preview();
-          "
-        >
-          Preview
-        </a>
-      <a 
-        class="btn btn-default" 
-        onClick="
-          $('#edit-comment-form-wrapper-<%= comment.id %>').toggle();
-          $('#c<%= comment.id %>show').toggle();
-          $('#<%= comment.id %>-like-emojis').toggle();
-          $('#comment-form-edit-<%= comment.id %>').toggle()
-        "
-      >
-        Cancel
-      </a>
-      <span class="form-grey"> &nbsp;
-        <br class="visible-xs" /><%= raw translation('comments._edit.logged_in', :username => current_user.username) %> |
-        <a target="_blank" href="/wiki/authoring-help#Formatting"><%= translation('comments._edit.formatting') %></a> |
-        <a onClick="$('#who-is-notified').toggle()"><%= translation('comments._edit.notifications') %></a>
-      </span>
-    </div>
-
-    <p id="who-is-notified" style="display:none;color:#888;">
-      <%= translation('comments._edit.email_notifications') %>
-    </p>
-  </form>
-</div>
\ No newline at end of file
diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index f64ec05607..799a412862 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -1,104 +1,156 @@
+<!-- comment is false in reply & main comment forms; defined for edit forms -->
+<% comment_id_string = comment ? comment.id.to_s : nil %>
 <!-- get_comment_form_id defined in app/helpers/application_helper.rb: -->
-<% comment_form_id = get_comment_form_id(location, local_assigns[:reply_to], nil) %>
-<div class="comment-form-wrapper card-body" style="background-color:#f8f8f8; border: 1px solid #e7e7e7;padding: 18px;">
-  <form id="comment-form-<%= comment_form_id %>" class="comment-form" data-remote="true" action="/comment/create/<%= @node.nid %><%= "?type=question" if local_assigns[:type]=="question" %>" <% if local_assigns[:aid].blank? %>method="post"<% end %>>
-    <% if current_user && current_user.id == @node.uid %>
-      <span class="pull-right" style="color:#ccc;">
-        <a target="_blank" href="https://publiclab.org/comment-templates">Add a template</a>
-      </span>
+<% comment_form_id = get_comment_form_id(location, local_assigns[:reply_to], comment_id_string) %>
+<div 
+  id="comment-form-wrapper-<%= comment_form_id %>" 
+  class="bg-light card card-body comment-form-wrapper"
+  style="
+    background-color: #f8f8f8; 
+    border: 1px solid #e7e7e7;
+    padding: 18px;
+    <%= "display: none" if location == :edit  %>
+  "
+>
+  <form 
+    id="comment-form-<%= comment_form_id %>" 
+    class="comment-form" 
+    <% if location != :edit %>
+      action="/comment/create/<%= @node.nid %>"
+      data-remote="true" 
+    <% else %>
+      action = "/comment/update/<%= comment.id %>"
+    <% end %>
+    method="post" 
+    <% if location == :edit %>
+      style="display: none;"
     <% end %>
-    <h4 style="margin-top:0;"><%= title %></h4>
+  >
+    <h4 style="margin-top: 0;">
+      <%= title %>
+    </h4>
+    <input 
+      type="hidden" 
+      name="authenticity_token" 
+      value="<%= form_authenticity_token %>"
+    />
     <style>
       .imagebar {
-        width:100%;
+        width: 100%;
       }
       #new_contributor_msg {
-        background-color:#C3CCE7;
+        background-color: #C3CCE7;
         font-size: 14px;
         padding: 5px;
         padding-top: 10px;
       }
     </style>
     <!-- location: for creating unique .dropzone IDs -->
-    <!-- this view is used for: main comment form, replies to comments, and 'responses' -->
+    <!--   can be :edit, :reply, :main, or :responses -->
     <!-- if location == reply, toolbar needs reply_to for dropzone IDs -->
-    <% locals = (location == :reply) ? 
-      { :location => location, :reply_to => reply_to } : 
-      { :location => location } 
-    %>
+    <% locals = {} %>
+    <% locals[:location] = location %>
+    <% locals[:reply_to] = reply_to if location == :reply %>
+    <% locals[:comment_id] = comment.id.to_s if comment %>
     <%= render :partial => "editor/toolbar", :locals => locals %>
-
-    <% if local_assigns[:reply_to].present? %>
-      <%= hidden_field_tag :reply_to, local_assigns[:reply_to] %>
-    <% end %>
-
-    <!-- most comment forms have two dropzones: 1) small button, 2) large form that covers textarea -->
-    <!-- this is the large dropzone -->
-    <div id="comment-form-body-<%= comment_form_id %>" class="comment-face form-group dropzone dropzone-large" data-form-id="<%= comment_form_id %>">
-      <%
-        body = body || params[:body]
-        # Look for comment templates
-        if params[:body].nil? && @node && @node.has_power_tag('comment-template')
-          body = Node.find_by(slug: @node.power_tag('comment-template')).try(:body)
-        end
-      %>
-      <% if is_new_contributor %>
+    <!-- the following div is where users can upload images via drag & drop -->
+    <!-- it is also toggled when user previews their comment -->
+    <div 
+      id="comment-form-body-<%= comment_form_id %>"
+      class="comment-form-body form-group dropzone dropzone-large"
+      data-form-id="<%= comment_form_id %>"
+    >
+      <% if location != :edit && is_new_contributor %>
         <div id="new_contributor_msg">
           <% cache('feature_welcome-msg', skip_digest: true) do %>
           <%= feature("welcome-msg") %>
           <% end %>
         </div>
       <% end %>
-      <textarea 
+      <textarea
         id="text-input-<%= comment_form_id %>" 
         class="form-control text-input" 
         name="body" 
         data-form-id="<%= comment_form_id %>" 
         onFocus="editing=true" 
         aria-label="Comment Text" 
-        style="border: 1px solid #bbb;border-bottom-left-radius: 0;border-bottom-right-radius: 0;border-bottom: 0;padding: 10px;" 
         rows="6" 
         cols="40" 
-        placeholder="<%= placeholder %>"><%= body %>
-      </textarea>
+        style="
+          border: 1px solid #bbb; 
+          border-bottom-left-radius: 0; 
+          border-bottom-right-radius: 0; 
+          border-bottom: 0; 
+          padding: 10px;
+        " 
+        placeholder="<%= placeholder %>"
+        <% comment_text = location == :edit ? comment.comment : params[:body] %>
+      ><%= comment_text %></textarea>
       <div class="imagebar">
         <div 
-          id="image-upload-progress-container-<%= comment_form_id %>"
-          style="display:none;" 
+          id="image-upload-progress-container-<%= comment_form_id %>" 
+          <%# has classes active pull-right in edit form %>
           class="progress progress-bar-container float-right"
+          style="display: none;" 
         >
           <div 
-            id="image-upload-progress-bar-<%= comment_form_id %>"
+            id="image-upload-progress-bar-<%= comment_form_id %>" 
             class="progress-bar progress-bar-striped progress-bar-animated" 
-            style="width: 0%;">
+            style="width: 0%;"
+          >
           </div>
         </div>
         <p>
-          <span 
+          <span
             id="image-upload-text-<%= comment_form_id %>" 
-            class="uploading-text" 
-            style="display:none;"
+            class="uploading uploading-text" 
+            style="display: none;"
           >
             <%= translation('comments._form.uploading') %>
           </span>
-          <span id="choose-one-<%= comment_form_id %>" class="prompt choose-one-prompt-text">
-            <span style="padding-right:4px;float:left;" class="d-none d-md-inline">
+          <span 
+            id="choose-one-<%= comment_form_id %>" 
+            class="prompt choose-one-prompt-text"
+          >
+            <span 
+              class="d-none d-md-inline hidden-xs"
+              style="padding-right: 4px; float: left;"
+            >
               <%= raw translation('comments._form.drag_and_drop') %>
             </span>
             <!-- http://stackoverflow.com/questions/11235206/twitter-bootstrap-form-file-element-upload-button -->
-            <label for="fileinput-choose-one-<%= comment_form_id %>">
-              <input id="fileinput-choose-one-<%= comment_form_id %>" type="file" name="image[photo]" style="display:none;" />
-              <a style="cursor: pointer;" class="d-none d-md-inline text-underline"><%= translation('comments._form.choose_one') %></a>
-              <span class="d-md-none">
+            <label
+              id="fileinput-choose-one-label-<%= comment_form_id %>"
+              for="fileinput-choose-one-<%= comment_form_id %>"
+            >
+              <input 
+                id="fileinput-choose-one-<%= comment_form_id %>" 
+                type="file" 
+                name="image[photo]" 
+                style="display: none;" 
+              />
+              <a 
+                class="d-none d-md-inline hidden-xs text-underline" 
+                style="cursor: pointer;" 
+              >
+                <%= translation('comments._form.choose_one') %>
+              </a>
+              <span class="visible-xs d-md-none">
                 <i class="fa fa-upload"></i>
-                <a><%= translation('comments._form.upload_image') %></a>
+                <a>
+                  <%= translation('comments._form.upload_image') %>
+                </a>
               </span>
             </label>
           </span>
         </p>
       </div>
     </div>
-    <div id="comment-preview-<%= comment_form_id %>" class="comment-preview" style="background: white; display: none;">
+    <div 
+      id="comment-preview-<%= comment_form_id %>" 
+      class="comment-preview well col-md-11" 
+      style="background: white; display: none;"
+    >
     </div>
     <script>
       $D = {
@@ -108,11 +160,17 @@
     </script>
     <script src="/emoji.js" type="text/javascript"></script>
     <script src="/assets/atwho_autocomplete.js" type="text/javascript"></script>
-
     <div class="control-group">
-      <button type="submit" class="btn btn-primary"><%= translation('comments._form.publish') %></button>
+      <button 
+        type="submit" 
+        class="btn btn-primary"
+      >
+        <%= translation('comments._form.publish') %>
+      </button>
       <a 
-        class="btn btn-outline-secondary preview-btn" id="toggle-preview-button-<%= comment_form_id %>" data-previewing-text="Hide Preview" 
+        id="toggle-preview-button-<%= comment_form_id %>" 
+        class="btn btn-default btn-outline-secondary preview-btn" 
+        data-previewing-text="Hide Preview" 
         onClick="
           $E.setState('<%= comment_form_id %>');
           $E.toggle_preview();
@@ -120,13 +178,30 @@
       >
         <%= translation('comments._form.preview') %>
       </a>
-      <span style="color:#888;"> &nbsp;
-        <br class="d-md-none" /><%= raw translation('comments._form.logged_in', :username => current_user.username) %> &nbsp;
+      <% if location == :edit %>
+        <a 
+          class="btn btn-default" 
+          onClick="
+            $('#comment-form-wrapper-edit-<%= comment.id %>').toggle();
+            $('#c<%= comment.id %>show').toggle();
+            $('#<%= comment.id %>-like-emojis').toggle();
+            $('#comment-form-edit-<%= comment.id %>').toggle()
+          "
+        >
+          Cancel
+        </a>
+      <% end %>
+      <span class="form-grey" style="color: #888;"> &nbsp;
+        <br class="visible-xs d-md-none" />
+        <%= raw translation(
+          'comments._form.logged_in', 
+          :username => current_user.username
+        ) %>
+        &nbsp;
         <a aria-label="Authoring Help" target="_blank" href="/wiki/authoring-help#Formatting"><i class="fa fa-question-circle"></i></a> &nbsp;
         <a onClick="changeNotificationIcon('#who-is-notified-form', '#bell')"><i id="bell" class="fa fa-bell-o"></i></a>
       </span>
     </div>
-
     <p id="who-is-notified-form" style="display:none;color:#888;">
       <%= translation('comments._form.email_notifications') %>
     </p>

From 6f7d3de6b3579d8028209b8647851a7f3d9ae4fa Mon Sep 17 00:00:00 2001
From: Will Gutierrez <will.gutierrez@gmail.com>
Date: Wed, 10 Feb 2021 16:07:28 -0800
Subject: [PATCH 2/6] delete templates functionality

---
 app/views/editor/_toolbar.html.erb | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/app/views/editor/_toolbar.html.erb b/app/views/editor/_toolbar.html.erb
index c34f7e4b05..f718d3aca7 100644
--- a/app/views/editor/_toolbar.html.erb
+++ b/app/views/editor/_toolbar.html.erb
@@ -1,17 +1,4 @@
 <div class="btn-toolbar" style="margin-bottom:8px;">
-  <div class="dropdown mr-2">
-    <div class="d-md-none d-lg-inline">
-      <a class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" href="#" >
-        Templates
-        <span class="caret"></span>
-      </a>
-      <div class="dropdown-menu">
-        <a class="dropdown-item" onClick="$E.apply_template('default')">Default</a>
-        <a class="dropdown-item" onClick="$E.apply_template('support')">Request help</a>
-        <a class="dropdown-item" onClick="$E.apply_template('event')">Post an event</a>
-      </div>
-    </div>
-  </div>
   <!-- defined in application_helper.rb -->
   <% toolbar_element_id = get_comment_form_id(location, local_assigns[:reply_to], local_assigns[:comment_id]) %>
   <div class="btn-group mr-2">

From c3acaf7de11c8f567ff2569d1444269facf19178 Mon Sep 17 00:00:00 2001
From: Will Gutierrez <will.gutierrez@gmail.com>
Date: Wed, 10 Feb 2021 16:08:24 -0800
Subject: [PATCH 3/6] merge comments/_edit & comments/_form partials; change
 #edit-comment-form-wrapper to #comment-form-wrapper-edit

---
 app/views/notes/_comment.html.erb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/views/notes/_comment.html.erb b/app/views/notes/_comment.html.erb
index 3e8ba3a999..88f65adbd5 100644
--- a/app/views/notes/_comment.html.erb
+++ b/app/views/notes/_comment.html.erb
@@ -59,7 +59,7 @@
           rel="tooltip" 
           title="Edit Comment"
           href="javascript:void(0)" onClick="
-            $('#edit-comment-form-wrapper-<%= comment.cid %>').toggle();
+            $('#comment-form-wrapper-edit-<%= comment.cid %>').toggle();
             $('#<%= comment.cid %>-like-emojis').toggle();                               
             $('#comment-form-edit-<%= comment.cid %>').toggle();
             $('#c<%= comment.cid %>show').toggle();
@@ -210,9 +210,16 @@
   </div>
 
   <% if current_user %>
-    <% h = { title: I18n.t('notes._comment.edit_comment'), comment: comment, placeholder: I18n.t('notes._comment.edit_placeholder') } %>
+    <% 
+      h = { 
+        title: I18n.t('notes._comment.edit_comment'), 
+        comment: comment, 
+        location: :edit,
+        placeholder: I18n.t('notes._comment.edit_placeholder')
+      } 
+    %>
     <% h[:is_answer] = true if local_assigns[:is_answer] %>
-    <%=  render :partial => "comments/edit", :locals => h %>
+    <%=  render :partial => "comments/form", :locals => h %>
   <% end %>
   <br />
 

From 51e6586a0c91619dc720bc27cd8ac69c0b3e5de2 Mon Sep 17 00:00:00 2001
From: Will Gutierrez <will.gutierrez@gmail.com>
Date: Thu, 11 Feb 2021 15:01:37 -0800
Subject: [PATCH 4/6] stop attaching ajax:event to edit forms

---
 app/assets/javascripts/comment.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/comment.js b/app/assets/javascripts/comment.js
index 039b5af104..6fb1f75fa3 100644
--- a/app/assets/javascripts/comment.js
+++ b/app/assets/javascripts/comment.js
@@ -1,6 +1,8 @@
 $(function() {
+  // attach AJAX eventHandlers to comment forms for form submission
+  // EXCEPT for edit comment forms (those don't use AJAX form submission)
   $('.comment-form').each(function() {
-    if(!$(this).hasClass('bound-success')) {
+    if(!$(this).hasClass('bound-success') && !$(this).hasClass('edit-comment-form')) {
       $(this).addClass('bound-success').on('ajax:success', function(e, data, status, xhr){
         $(this).find('.text-input').prop('disabled',false);
         $(this).find('.text-input').val('');
@@ -12,7 +14,7 @@ $(function() {
       });
     }
 
-    if(!$(this).hasClass('bound-beforeSend')) {
+    if(!$(this).hasClass('bound-beforeSend') && !$(this).hasClass('edit-comment-form')) {
       $(this).addClass('bound-beforeSend').on('ajax:beforeSend', function(event){
         $(this).find(".text-input").prop('disabled',true)
         $(this).find('.text-input').val('');
@@ -20,7 +22,7 @@ $(function() {
       });
     }
 
-    if(!$(this).hasClass('bound-error')) {
+    if(!$(this).hasClass('bound-error') && !$(this).hasClass('edit-comment-form')) {
       $(this).addClass('bound-error').on('ajax:error', function(e,response){
         notyNotification('mint', 3000, 'error', 'topRight', 'Some error occured while adding comment');
         $(this).find('.text-input').prop('disabled',false);
@@ -31,7 +33,7 @@ $(function() {
       });
     }
 
-    if(!$(this).hasClass('bound-keypress')) {
+    if(!$(this).hasClass('bound-keypress') && !$(this).hasClass('edit-comment-form')) {
       $(this).addClass('bound-keypress');
 
       $(this).find('.text-input').val('');

From d128568e5747ec941d1788da82547fa98a0f7615 Mon Sep 17 00:00:00 2001
From: Will Gutierrez <will.gutierrez@gmail.com>
Date: Thu, 11 Feb 2021 15:02:01 -0800
Subject: [PATCH 5/6] stop running scripts on edit forms

---
 app/views/comments/_form.html.erb | 57 +++++++++++++++++--------------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index 799a412862..3a0fe619bd 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -14,17 +14,18 @@
 >
   <form 
     id="comment-form-<%= comment_form_id %>" 
-    class="comment-form" 
-    <% if location != :edit %>
+    <% if location == :edit %>
+      action = "/comment/update/<%= comment.id %>"
+      class="edit-comment-form well"
+      style="display: none;"
+    <% else %>
       action="/comment/create/<%= @node.nid %>"
+      class="comment-form"
+      <%# data-remote="true" means the form is submitted with AJAX %>
+      <%# see https://guides.rubyonrails.org/working_with_javascript_in_rails.html#remote-elements %>
       data-remote="true" 
-    <% else %>
-      action = "/comment/update/<%= comment.id %>"
     <% end %>
     method="post" 
-    <% if location == :edit %>
-      style="display: none;"
-    <% end %>
   >
     <h4 style="margin-top: 0;">
       <%= title %>
@@ -73,19 +74,22 @@
         name="body" 
         data-form-id="<%= comment_form_id %>" 
         onFocus="editing=true" 
-        aria-label="Comment Text" 
+        <% if location == :edit %>
+          aria-label="Edit Comment"
+        <% else %>
+          aria-label="Comment Text" 
+          style="
+            border: 1px solid #bbb; 
+            border-bottom-left-radius: 0; 
+            border-bottom-right-radius: 0; 
+            border-bottom: 0; 
+            padding: 10px;
+          " 
+        <% end %>
         rows="6" 
         cols="40" 
-        style="
-          border: 1px solid #bbb; 
-          border-bottom-left-radius: 0; 
-          border-bottom-right-radius: 0; 
-          border-bottom: 0; 
-          padding: 10px;
-        " 
         placeholder="<%= placeholder %>"
-        <% comment_text = location == :edit ? comment.comment : params[:body] %>
-      ><%= comment_text %></textarea>
+      ><%= location == :edit ? comment.comment : params[:body] %></textarea>
       <div class="imagebar">
         <div 
           id="image-upload-progress-container-<%= comment_form_id %>" 
@@ -152,14 +156,17 @@
       style="background: white; display: none;"
     >
     </div>
-    <script>
-      $D = {
-        uid: <%= current_user.uid if current_user %>,
-        type: 'comment'
-      };
-    </script>
-    <script src="/emoji.js" type="text/javascript"></script>
-    <script src="/assets/atwho_autocomplete.js" type="text/javascript"></script>
+    <% if location != :edit %>
+      <script>
+        $D = {
+          uid: <%= current_user.uid if current_user %>,
+          type: 'comment'
+        };
+      </script>
+      <script src="/emoji.js" type="text/javascript"></script>
+      <%# if this script runs on the edit form, it will blank out the value of #text-input-edit-123 %>
+      <script src="/assets/atwho_autocomplete.js" type="text/javascript"></script>
+    <% end %>
     <div class="control-group">
       <button 
         type="submit" 

From 3f2e80765940e451d7784041e56628226b592566 Mon Sep 17 00:00:00 2001
From: Will Gutierrez <will.gutierrez@gmail.com>
Date: Thu, 11 Feb 2021 15:36:23 -0800
Subject: [PATCH 6/6] add hidden_field_tag for reply_to

---
 app/views/comments/_form.html.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index 3a0fe619bd..4c9400c699 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -54,6 +54,9 @@
     <% locals[:reply_to] = reply_to if location == :reply %>
     <% locals[:comment_id] = comment.id.to_s if comment %>
     <%= render :partial => "editor/toolbar", :locals => locals %>
+    <% if local_assigns[:reply_to].present? %>
+      <%= hidden_field_tag :reply_to, local_assigns[:reply_to] %>
+    <% end %>
     <!-- the following div is where users can upload images via drag & drop -->
     <!-- it is also toggled when user previews their comment -->
     <div