Merge branch 'develop' into art/user-profile

Author: ArtOfCode-

app/assets/javascripts/comments.js

@@ -387,7 +387,7 @@ $(() => {
 
     const $tgt = $(ev.target);
     const content = $tgt.val();
-    const splat = content.split(' ');
+    const splat = content.split(/\s+/);
     const caretPos = $tgt[0].selectionStart;
     const [currentWord, posInWord] = QPixel.currentCaretSequence(splat, caretPos);
 

app/assets/javascripts/markdown.js

@@ -29,10 +29,9 @@ $(() => {
     }
   });
 
-  $('#markdown-link-name, #markdown-link-url').on('keydown', (ev) => {
-    if (ev.keyCode === 13) {
-      // don't submit post form on enter in link modal
-      ev.stopPropagation();
+  QPixel.DOM?.addSelectorListener('keypress', '#markdown-link-name, #markdown-link-url', (ev) => {
+    if (ev instanceof KeyboardEvent && ev.key === 'Enter') {
+      ev.preventDefault();
     }
   });
 

app/controllers/tags_controller.rb

@@ -225,30 +225,34 @@ def merge
   end
 
   def nuke
-    Post.transaction do
-      AuditLog.admin_audit event_type: 'tag_nuke', related: @tag, user: current_user,
-                           comment: "#{@tag.name} (#{@tag.id})"
-
-      tables = ['posts_tags', 'categories_moderator_tags', 'categories_required_tags', 'categories_topic_tags',
-                'post_history_tags', 'suggested_edits_tags', 'suggested_edits_before_tags']
-
-      # Remove tag from caches
-      caches_sql = 'UPDATE posts INNER JOIN posts_tags ON posts.id = posts_tags.post_id ' \
-                   'SET posts.tags_cache = REPLACE(posts.tags_cache, ?, ?) ' \
-                   'WHERE posts_tags.tag_id = ?'
-      exec_sql([caches_sql, "\n- #{@tag.name}\n", "\n", @tag.id])
+    if @tag.children.any?
+      flash[:error] = 'Cannot delete a tag that has children.'
+    else
+      Post.transaction do
+        AuditLog.admin_audit event_type: 'tag_nuke', related: @tag, user: current_user,
+                             comment: "#{@tag.name} (#{@tag.id})"
+
+        tables = ['posts_tags', 'categories_moderator_tags', 'categories_required_tags', 'categories_topic_tags',
+                  'post_history_tags', 'suggested_edits_tags', 'suggested_edits_before_tags']
+
+        # Remove tag from caches
+        caches_sql = 'UPDATE posts INNER JOIN posts_tags ON posts.id = posts_tags.post_id ' \
+                     'SET posts.tags_cache = REPLACE(posts.tags_cache, ?, ?) ' \
+                     'WHERE posts_tags.tag_id = ?'
+        exec_sql([caches_sql, "\n- #{@tag.name}\n", "\n", @tag.id])
+
+        # Delete all references to the tag
+        tables.each do |tbl|
+          sql = "DELETE FROM #{tbl} WHERE tag_id = ?"
+          exec_sql([sql, @tag.id])
+        end
 
-      # Delete all references to the tag
-      tables.each do |tbl|
-        sql = "DELETE FROM #{tbl} WHERE tag_id = ?"
-        exec_sql([sql, @tag.id])
+        # Nuke it
+        @tag.destroy
       end
 
-      # Nuke it
-      @tag.destroy
+      flash[:success] = "Deleted #{@tag.name}"
     end
-
-    flash[:success] = "Deleted #{@tag.name}"
     redirect_to category_tags_path(@category)
   end
 

app/views/comment_threads/_expanded.html.erb

@@ -59,8 +59,9 @@
           <%= render 'comments/skip_deleted', inline: inline, num_skipped: skipped_deleted, thread: thread %>
           <% skipped_deleted = 0 %>
         <% end %>
-        <% if shown_comments_count > max_shown_comments && comment.id.to_i == comment_id.to_i %>
-          <%= render 'comments/skip_more', shown_count: shown_comments_count, thread: thread %>
+        <% skipped_more = thread.reply_count - shown_comments_count %>
+        <% if shown_comments_count > max_shown_comments && skipped_more.positive? && comment.id.to_i == comment_id.to_i %>
+          <%= render 'comments/skip_more', num_skipped: skipped_more, thread: thread %>
         <% end %>
         <div class="widget--body" role="listitem">
           <%= render 'comments/comment', comment: comment, pingable: pingable %>

app/views/comments/_skip_more.html.erb

@@ -2,11 +2,10 @@
     Renders widgets indicating that there more comments are not shown
 
     Variables:
-      shown_count : number of comments shown on the thread
+      num_skipped : number of comments skipped on the thread
       thread      : CommentThread to display the widget for
 %>
 
 <div class="widget--body widget--more-comments" role="listitem">
-  <% skipped_count = thread.reply_count - shown_count %>
-  <p>Skipping <%= pluralize(skipped_count, 'more comment') %></p>
+  <p>Skipping <%= pluralize(num_skipped, 'more comment') %></p>
 </div>

app/views/tags/nuke_warning.html.erb

@@ -6,6 +6,12 @@
 
 <h1>Delete tag <%= @tag.name %></h1>
 
+<% if @tag.children.any? %>
+<div class="notice is-warning has-color-yellow-900">
+  <p>Tags with children cannot be deleted. Please reparent the children first.</p>
+</div>
+<% else %>
+
 <div class="notice is-danger has-color-red-900">
   <p>
     Deleting a tag results in making it seem to have never existed in the first place. No record will be kept of the tag.
@@ -27,3 +33,4 @@
             role: 'button' do %>
   I understand, delete <%= @tag.name %>
 <% end %>
+<% end %>