Changeset eb2df0a in cboos.git

Timestamp:

Jan 14, 2019, 1:36:34 AM (5 years ago)

Author:

Christian Boos <cboos@…>

Branches:

t13116-experimental.2

Parents:

01d489e2

git-author:

Christian Boos <cboos@…> (01/14/19 01:35:12)

git-committer:

Christian Boos <cboos@…> (01/14/19 01:36:34)

Message:

(#13116) add ticket comment buttons via insertNearReplyToComment JavaScript? API

Files:

• trac/ticket/templates/ticket.html (modified) (1 diff)
• trac/ticket/templates/ticket_box.html (modified) (1 diff)
• tracopt/ticket/htdocs/ticketclone.coffee (modified) (1 diff)
• tracopt/ticket/htdocs/ticketclone.js (modified) (1 diff)
• tracopt/ticket/htdocs/ticketdeleter.coffee (modified) (2 diffs)
• tracopt/ticket/htdocs/ticketdeleter.js (modified) (2 diffs)

trac/ticket/templates/ticket.html

@@ -218 +218 @@
           </div>
           # endfor
+
+          <script>
+            // inlinebuttons in ticket change are presented in
+            // left-to-right order, i.e. those added before
+            // #reply-to-comment-n will be on its left, those added
+            // after will be on its right
+            function insertNearReplyToComment(num, content, side) {
+              var $replyto = $("#reply-to-comment-" + num);
+              if (side === 'right') {
+                $replyto.after(content);
+              } else if (side === 'rightmost') {
+                $replyto.parent().append(content);
+              } else if (side === 'leftmost') {
+                $replyto.parent().prepend(content);
+              } else { // 'left'
+                $replyto.before(content);
+              }
+            }
+          </script>
+
         </div>
       </div>

trac/ticket/templates/ticket_box.html

@@ -195 +195 @@
           if (side === 'right') {
             $("#ticket .description #addreply").before(content);
+          } else if (side === 'rightmost') {
+            $("#ticket .description > h2").after(content);
           } else if (side === 'leftmost') {
             $("#ticket .description").children(".searchable, br")

tracopt/ticket/htdocs/ticketclone.coffee

@@ -74 +74 @@
           description: quoteText(c.comment))
 
-      btns.prepend cform
+      insertNearReplyToComment c.cnum, cform
 
 

tracopt/ticket/htdocs/ticketclone.js

@@ -47 +47 @@
           description: quoteText(c.comment)
         }));
-        results.push(btns.prepend(cform));
+        results.push(insertNearReplyToComment(c.cnum, cform));
       } else {
         results.push(void 0);

tracopt/ticket/htdocs/ticketdeleter.coffee

@@ -38 +38 @@
   """
 
-deleteComment = (c) ->
+addDeleteComment = (c) ->
   # c.id == "trac-change-3-1347886395121000"
   #          0123456789012
   [cnum, cdate] = c.id.substr(12).split('-')
-  $ """
+  insertNearReplyToComment cnum, $("""
     <form action="#" method="get">
      <div class="inlinebuttons">
@@ -54 +54 @@
      </div>
     </form>
-  """
+  """), 'leftmost'
 
 
 $(document).ready () ->
   # Insert "Delete" buttons for ticket description and each comment
-  insertNearReplyToDescription deleteTicket(), 'leftmost'
-  $('#changelog div.change').each () ->
-    $('.trac-ticket-buttons', this).prepend deleteComment this
+  insertNearReplyToDescription deleteTicket, 'leftmost'
+  $('#changelog div.change').each () -> addDeleteComment this

tracopt/ticket/htdocs/ticketdeleter.js

@@ -1 +1 @@
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var $, captionedButton, deleteComment, deleteTicket;
+  var $, addDeleteComment, captionedButton, deleteTicket;
 
   $ = jQuery;
@@ -17 +17 @@
   };
 
-  deleteComment = function(c) {
+  addDeleteComment = function(c) {
     var cdate, cnum, ref;
     ref = c.id.substr(12).split('-'), cnum = ref[0], cdate = ref[1];
-    return $("<form action=\"#\" method=\"get\">\n <div class=\"inlinebuttons\">\n  <input type=\"hidden\" name=\"action\" value=\"delete-comment\">\n  <input type=\"hidden\" name=\"cnum\" value=\"" + cnum + "\">\n  <input type=\"hidden\" name=\"cdate\" value=\"" + cdate + "\">\n  <input type=\"submit\"\n         value=\"" + (captionedButton('–', _('Delete'))) + "\"\n         title=\"" + (_('Delete comment %(num)s', {
+    return insertNearReplyToComment(cnum, $("<form action=\"#\" method=\"get\">\n <div class=\"inlinebuttons\">\n  <input type=\"hidden\" name=\"action\" value=\"delete-comment\">\n  <input type=\"hidden\" name=\"cnum\" value=\"" + cnum + "\">\n  <input type=\"hidden\" name=\"cdate\" value=\"" + cdate + "\">\n  <input type=\"submit\"\n         value=\"" + (captionedButton('–', _('Delete'))) + "\"\n         title=\"" + (_('Delete comment %(num)s', {
       num: cnum
-    })) + "\"\n         class=\"trac-delete\">\n </div>\n</form>");
+    })) + "\"\n         class=\"trac-delete\">\n </div>\n</form>"), 'leftmost');
   };
 
   $(document).ready(function() {
-    insertNearReplyToDescription(deleteTicket(), 'leftmost');
+    insertNearReplyToDescription(deleteTicket, 'leftmost');
     return $('#changelog div.change').each(function() {
-      return $('.trac-ticket-buttons', this).prepend(deleteComment(this));
+      return addDeleteComment(this);
     });
   });