From 86db66d4cba493d45eb4afe86d6ac5d918e4ccad Mon Sep 17 00:00:00 2001
From: Will Gutierrez <will.gutierrez@gmail.com>
Date: Sat, 23 Jan 2021 10:17:34 -0800
Subject: [PATCH 1/5] move E.initialize call to higher level views #9004

---
 app/views/comments/_form.html.erb | 3 ---
 app/views/notes/show.html.erb     | 3 ++-
 app/views/questions/show.html.erb | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index 3e949f50a3..de29060868 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -90,9 +90,6 @@
       <div id="preview<%= comment_form_id %>" class="comment-preview" style="background: white; display: none;">
       </div>
       <script>
-        jQuery(document).ready(function() {
-          $E.initialize();
-        });
         $D = {
           uid: <%= current_user.uid if current_user %>,
           type: 'comment'
diff --git a/app/views/notes/show.html.erb b/app/views/notes/show.html.erb
index c9e08dc04c..1256c96278 100644
--- a/app/views/notes/show.html.erb
+++ b/app/views/notes/show.html.erb
@@ -146,7 +146,8 @@
   $("#collapse-button").click(function(){
       $(this).remove();
   });
-  $(function(){
+  $(function() {
+    $E.initialize();
     $("img").lazyload();
   });
 </script>
diff --git a/app/views/questions/show.html.erb b/app/views/questions/show.html.erb
index fb0c49ef74..66fe31b531 100644
--- a/app/views/questions/show.html.erb
+++ b/app/views/questions/show.html.erb
@@ -2,6 +2,7 @@
 <%= javascript_include_tag('notes') %>
 <%= javascript_include_tag('textbox_expand') %>
 <script> var comments_length = <%= @node.comments.length %>; $(function(){
+  $E.initialize();
   $("img").lazyload();
 });</script>
 <%= javascript_include_tag('question') %>

From 30dc90d1f8eb178420a2a2c68986f3dffc1eeb33 Mon Sep 17 00:00:00 2001
From: Will Gutierrez <will.gutierrez@gmail.com>
Date: Sat, 23 Jan 2021 10:18:15 -0800
Subject: [PATCH 2/5] change selectors for preview & textarea elements #9004

---
 app/views/comments/_edit.html.erb | 141 ++++++++----------------------
 1 file changed, 35 insertions(+), 106 deletions(-)

diff --git a/app/views/comments/_edit.html.erb b/app/views/comments/_edit.html.erb
index 10e2204b44..6f65d667e5 100644
--- a/app/views/comments/_edit.html.erb
+++ b/app/views/comments/_edit.html.erb
@@ -12,119 +12,48 @@
     <!-- 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="c<%= comment.id%>div" class="form-group">
-    <textarea aria-label="Edit Comment" onFocus="editing=true" name="body" class="form-control" id="c<%= comment.id%>text" rows="6" cols="40" placeholder="<%= placeholder %>"><%= !(comment.is_a?Answer) ? comment.comment : comment.content %></textarea>
-    <div class="imagebar">
-      <div id="c<%= comment.id%>progress" style="display:none;" class="progress progress-bar-container active pull-right">
-        <div id="c<%= comment.id%>progress-bar" class="progress-bar progress-bar-striped progress-bar-animated" style="width: 0%;"></div>
-      </div>
-      <p>
-        <span id="c<%= comment.id%>uploading" class="uploading uploading-text" style="display:none;">
-          <%= translation('comments._edit.uploading') %>
-        </span>
-        <span id="c<%= comment.id%>prompt" class="prompt choose-one-prompt-text">
-          <span style="padding-right:4px;float:left;" class="hidden-xs">
-          <%= raw translation('comments._edit.drag_and_drop') %>
+    <div id="c<%= comment.id%>div" class="form-group dropzone">
+      <textarea aria-label="Edit Comment" onFocus="editing=true" name="body" class="form-control" id="text-input-edit-<%= comment.id%>" rows="6" cols="40" placeholder="<%= placeholder %>"><%= !(comment.is_a?Answer) ? comment.comment : comment.content %></textarea>
+      <div class="imagebar">
+        <div id="c<%= comment.id%>progress" style="display:none;" class="progress progress-bar-container active pull-right">
+          <div id="c<%= comment.id%>progress-bar" class="progress-bar progress-bar-striped progress-bar-animated" style="width: 0%;"></div>
+        </div>
+        <p>
+          <span id="c<%= comment.id%>uploading" class="uploading uploading-text" style="display:none;">
+            <%= translation('comments._edit.uploading') %>
           </span>
-          <label id="c<%= comment.id%>input_label" for="c<%= comment.id%>input">
-            <input id="c<%= comment.id%>input" 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 id="c<%= comment.id%>prompt" 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>
-        </span>
-      </p>
+            <label id="c<%= comment.id%>input_label" for="c<%= comment.id%>input">
+              <input id="c<%= comment.id%>input" 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>
-      <script type="application/javascript">
-        function setInit(id) {
-          const textArea = 'c'+id+'text';
-          const preview = 'c'+id+'preview';
-          $E.setState(textArea, preview);
-        }
-
-        $('#c<%= comment.id%>div').on('dragover',function(e) {
-          e.preventDefault();
-          $('#c<%= comment.id%>div').addClass('hover');
-        });
-
-        $('#c<%= comment.id%>div').on('dragout',function(e) {
-          $('#c<%= comment.id%>div').removeClass('hover');
-        });
-
-        $('#c<%= comment.id%>div').on('drop',function(e) {
-          e.preventDefault();
-          $D.selected = $(e.target).closest('div.comment-form-wrapper').eq(0);
-          setInit(<%= comment.id %>);
-        });
-
-        $('#c<%= comment.id%>div').fileupload({
-          url: "/images",
-          paramName: "image[photo]",
-          dropZone: $('#c<%= comment.id%>div'),
-          dataType: 'json',
-          formData: {
-            'uid':<%= current_user.uid %>,
-            'nid':<%= comment.uid %>
-          },
-          start: function(e) {
-            $('#c<%= comment.id%>progress').show()
-            $('#c<%= comment.id%>uploading').show()
-            $('#c<%= comment.id%>prompt').hide()
-            $('#c<%= comment.id%>div').removeClass('hover');
-          },
-          done: function (e, data) {
-            $('#c<%= comment.id%>progress').hide()
-            $('#c<%= comment.id%>progress #c<%= comment.id%>progress-bar').css('width', 0);
-            $('#c<%= comment.id%>uploading').hide()
-            $('#c<%= comment.id%>prompt').show()
-            var is_image = false
-            if (data.result['filename'].substr(-3,3) == "jpg") is_image = true
-            if (data.result['filename'].substr(-4,4) == "jpeg") is_image = true
-            if (data.result['filename'].substr(-3,3) == "png") is_image = true
-            if (data.result['filename'].substr(-3,3) == "gif") is_image = true
-            if (data.result['filename'].substr(-3,3) == "JPG") is_image = true
-            if (data.result['filename'].substr(-4,4) == "JPEG") is_image = true
-            if (data.result['filename'].substr(-3,3) == "PNG") is_image = true
-            if (data.result['filename'].substr(-3,3) == "GIF") is_image = true
-
-            if (is_image) {
-              image_url = data.result.url.split('?')[0];
-              orig_image_url = image_url.replace('medium','original');
-              $E.wrap('[![',']('+image_url+')]('+orig_image_url+')', {'newline': true, 'fallback': data.result['filename']});
-            } else {
-              $E.wrap('<a href="'+data.result.url.split('?')[0]+'"><i class="fa fa-file"></i> ','</a>', {'newline': true, 'fallback': data.result['filename']});
-            }
-
-            if ($('#node_images').val() && $('#node_images').val().split(',').length > 1) $('#node_images').val([$('#node_images').val(),data.result.id].join(','));
-            else $('#node_images').val(data.result.id)
-          },
-
-          // fileuploadfail: function(e,data) {},
-          progressall: function (e, data) {
-            var progress = parseInt(data.loaded / data.total * 100, 10);
-            $('#c<%= comment.id%>progress #c<%= comment.id%>progress-bar').css(
-                'width',
-                progress + '%'
-            );
-          }
-        });
-      </script>
-
-      <div class="comment-preview well col-md-11" id="c<%= comment.id %>preview" style="background:white;display: none">
+      <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"  data-previewing-text="Hide Preview"
-              onClick="$('#c<%= comment.id %>preview').toggle();
-              $('#c<%= comment.id %>text').toggle();
-              $('#c<%= comment.id %>text').next('#imagebar').toggle();
-              this.previewing = !this.previewing;
-              $('#c<%= comment.id %>edit .preview-btn').button(this.previewing ? 'previewing' : 'reset');
-              $E.generate_preview('c<%= comment.id %>preview',$('#c<%= comment.id %>text').val())">
+          <a 
+            class="btn btn-default preview-btn"  
+            data-previewing-text="Hide Preview" 
+            onClick="
+              $E.setState(
+                'text-input-edit-<%= comment.id%>', 
+                'comment-preview-edit-<%= comment.id %>'
+              );
+              $E.toggle_preview();
+            "
+          >
             Preview
           </a>
           <a class="btn btn-default" onClick="$('#c<%= comment.id %>show').toggle();$('#c<%= comment.id %>edit').toggle()">

From 69c544ae86caaa55c1b1ca4d1f92f42789a08b7e Mon Sep 17 00:00:00 2001
From: Will Gutierrez <will.gutierrez@gmail.com>
Date: Sat, 23 Jan 2021 10:20:30 -0800
Subject: [PATCH 3/5] change #edit-comment-btn to .edit-comment-btn #9004

---
 app/views/notes/_comment.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/notes/_comment.html.erb b/app/views/notes/_comment.html.erb
index 82ed596c80..6821cd1749 100644
--- a/app/views/notes/_comment.html.erb
+++ b/app/views/notes/_comment.html.erb
@@ -53,7 +53,7 @@
         <i data-toggle="tooltip" title="This comment was posted by email." class="fa fa-envelope"></i>
       <% end %>
       <% if current_user && comment.uid == current_user.uid %>
-        <a aria-label="Edit comment" class="btn btn-outline-secondary btn-sm" id="edit-comment-btn" href="javascript:void(0)" onClick="$('#c<%= comment.cid %>edit').toggle();$('#c<%= comment.cid %>show').toggle();setInit(<%= comment.cid %>);">
+        <a aria-label="Edit comment" class="btn btn-outline-secondary btn-sm edit-comment-btn" href="javascript:void(0)" onClick="$('#c<%= comment.cid %>edit').toggle();$('#c<%= comment.cid %>show').toggle();">
           <i class="fa fa-pencil"></i>
         </a>
       <% end %>

From 4abe44ff80a19446e384bb11c5f152f5b5a45f50 Mon Sep 17 00:00:00 2001
From: Will Gutierrez <will.gutierrez@gmail.com>
Date: Sat, 23 Jan 2021 10:20:47 -0800
Subject: [PATCH 4/5] change selectors to match new edit form #9004

---
 test/system/comment_test.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/system/comment_test.rb b/test/system/comment_test.rb
index 1192629f57..518f6934b6 100644
--- a/test/system/comment_test.rb
+++ b/test/system/comment_test.rb
@@ -179,10 +179,10 @@ def get_path(page_type, path)
       page.execute_script <<-JS
         var comment = $(".comment")[1];
         var commentID = comment.id;
-        var editCommentBtn = $(comment).find('.navbar-text #edit-comment-btn')
+        var editCommentBtn = $(comment).find('.navbar-text .edit-comment-btn')
         // Toggle edit mode
         $(editCommentBtn).click()
-        var commentTextarea = $('#' + commentID + 'text');
+        var commentTextarea = $('#text-input-edit-' + commentID);
         $(commentTextarea).val('Updated comment.')
         var submitCommentBtn = $('#' + commentID + ' .control-group .btn-primary')[1];
         $(submitCommentBtn).click()
@@ -263,7 +263,7 @@ def get_path(page_type, path)
       })
       visit get_path(page_type, nodes(node_name).path)
       # open the edit comment form:
-      page.find("#edit-comment-btn").click
+      page.find(".edit-comment-btn").click
       # find the parent of edit comment's fileinput:
       comment_fileinput_parent_id = page.find('[id^=dropzone-small-edit-]')[:id] # 'begins with' CSS selector
       comment_id_num = /dropzone-small-edit-(\d+)/.match(comment_fileinput_parent_id)[1]
@@ -336,13 +336,13 @@ def get_path(page_type, path)
       })
       visit get_path(page_type, nodes(node_name).path)
       # open up the edit comment form
-      page.find("#edit-comment-btn").click
+      page.find(".edit-comment-btn").click
       edit_comment_form = page.find('h4', text: 'Edit comment').find(:xpath, '..')
       # we need the comment ID:
       edit_comment_form_id = edit_comment_form[:id]
       # regex to strip the ID number out of string. ID format is #c1234edit
       comment_id_num = /c(\d+)edit/.match(edit_comment_form_id)[1]
-      edit_preview_id = '#c' + comment_id_num + 'preview'
+      edit_preview_id = '#comment-preview-edit-' + comment_id_num
       # the <inputs> that take image uploads are hidden, so reveal them:
       Capybara.ignore_hidden_elements = false
       file_input_element = edit_comment_form.all('input')[1]
@@ -443,7 +443,7 @@ def get_path(page_type, path)
       comment_id_num = /comment-body-(\d+)/.match(comment_id)[1]
       comment_dropzone_selector = '#c' + comment_id_num + 'div'
       # open the edit comment form
-      page.find("#edit-comment-btn").click
+      page.find(".edit-comment-btn").click
       # drop into the edit comment form
       Capybara.ignore_hidden_elements = false
       drop_in_dropzone("#{Rails.root.to_s}/public/images/pl.png", comment_dropzone_selector)
@@ -475,7 +475,7 @@ def get_path(page_type, path)
       })
       visit get_path(page_type, nodes(node_name).path)
       # open the edit comment form:
-      find("#edit-comment-btn").click
+      find(".edit-comment-btn").click
       # find the parent of edit comment's fileinput:
       comment_fileinput_parent_id = page.find('[id^=dropzone-small-edit-]')[:id] # 'begins with' CSS selector
       comment_id_num = /dropzone-small-edit-(\d+)/.match(comment_fileinput_parent_id)[1]
@@ -496,7 +496,7 @@ def get_path(page_type, path)
       page.find('#c' + comment_id_num + 'edit a', text: 'Preview').click
       # once preview is open, the images are embedded in the page.
       # there should be 1 image in main, and 1 image in edit
-      assert_selector('#c' + comment_id_num + 'preview img', count: 1)
+      assert_selector('#comment-preview-edit-' + comment_id_num + ' img', count: 1)
       assert_selector('#preview-main img', count: 1)
     end
 
@@ -512,12 +512,12 @@ def get_path(page_type, path)
       visit get_path(page_type, nodes(node_name).path)
       # find the EDIT id
       # open up the edit comment form
-      page.find("#edit-comment-btn").click
+      page.find(".edit-comment-btn").click
       edit_comment_form_id = page.find('h4', text: 'Edit comment').find(:xpath, '..')[:id]
       # regex to strip the ID number out of string. ID format is #c1234edit
       edit_id_num = /c(\d+)edit/.match(edit_comment_form_id)[1]
       # open the edit comment form
-      edit_preview_id = '#c' + edit_id_num + 'preview'
+      edit_preview_id = '#comment-preview-edit-' + edit_id_num
       # find the REPLY id
       page.all('p', text: 'Reply to this comment...')[0].click
       reply_dropzone_id = page.find('[id^=dropzone-small-reply-]')[:id]
@@ -536,7 +536,7 @@ def get_path(page_type, path)
       # click preview buttons in reply and edit form
       page.find('#c' + edit_id_num + 'edit a', text: 'Preview').click
       page.first('a', text: 'Preview').click
-      assert_selector('#c' + edit_id_num + 'preview img', count: 1)
+      assert_selector('#comment-preview-edit-' + edit_id_num + ' img', count: 1)
       assert_selector('#preview-reply-' + reply_id_num, count: 1)
     end
 
@@ -559,7 +559,7 @@ def get_path(page_type, path)
       })
       visit get_path(page_type, nodes(node_name).path)
       # open up the edit comment form
-      page.find("#edit-comment-btn").click
+      page.find(".edit-comment-btn").click
       # find the EDIT id
       edit_comment_form_id = page.find('h4', text: 'Edit comment').find(:xpath, '..')[:id]
       # open up the reply comment form

From ed09de9a160185c99684aac650e8f2eceed02ddc Mon Sep 17 00:00:00 2001
From: noi5e <will.gutierrez@gmail.com>
Date: Tue, 26 Jan 2021 13:47:31 -0800
Subject: [PATCH 5/5] update selectors for edit form #9004

---
 test/system/comment_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/system/comment_test.rb b/test/system/comment_test.rb
index e94b5f1da7..56623e46dc 100644
--- a/test/system/comment_test.rb
+++ b/test/system/comment_test.rb
@@ -341,7 +341,7 @@ def get_path(page_type, path)
       # we need the comment ID:
       edit_comment_form_id = edit_comment_form[:id]
       # regex to strip the ID number out of string. ID format is #c1234edit
-      comment_id_num = /c(\d+)edit/.match(edit_comment_form_id)[1]
+      comment_id_num = /comment-form-edit-(\d+)/.match(edit_comment_form_id)[1]
       edit_preview_id = '#comment-preview-edit-' + comment_id_num
       # the <inputs> that take image uploads are hidden, so reveal them:
       Capybara.ignore_hidden_elements = false