Ticket #30979: 30979.2.diff

src/wp-admin/js/edit-comments.js

@@ -416 +416 @@
                 }
 
                 setTimeout(function() {
-                        var rtop, rbottom, scrollTop, vp, scrollBottom;
+                        var rtop, rbottom, scrollTop, vp, scrollBottom, contextMenu = false;
 
                         rtop = $('#replyrow').offset().top;
                         rbottom = rtop + $('#replyrow').height();
@@ -429 +429 @@
                         else if ( rtop - 20 < scrollTop )
                                 window.scroll(0, rtop - 35);
 
-                        $('#replycontent').focus().keyup(function(e){
-                                if ( e.which == 27 )
+                        $('#replycontent').focus().on('mousedown keyup', function(e){
+                                if ( e.which == 27 && ! contextMenu ) {
                                         commentReply.revert(); // close on Escape
+                                }
+
+                                if ( e.button == 2 || e.which == 93 ) {
+                                        contextMenu = true;
+                                }
+                                else {
+                                        contextMenu = false;
+                                }
                         });
                 }, 600);