Ticket #54548: 54548.3.diff

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

@@ -1019 +1019 @@
                 }
 
                 setTimeout(function() {
-                        var rtop, rbottom, scrollTop, vp, scrollBottom;
+                        var rtop, rbottom, scrollTop, vp, scrollBottom,
+                                isComposing = false;
 
                         rtop = $('#replyrow').offset().top;
                         rbottom = rtop + $('#replyrow').height();
@@ -1032 +1033 @@
                         else if ( rtop - 20 < scrollTop )
                                 window.scroll(0, rtop - 35);
 
-                        $('#replycontent').trigger( 'focus' ).on( 'keyup', function(e){
-                                if ( e.which == 27 )
-                                        commentReply.revert(); // Close on Escape.
-                        });
+                        $( '#replycontent' )
+                                .trigger( 'focus' )
+                                .on( 'keyup', function( e ) {
+                                        // Close on Escape except when Input Method Editors (IMEs) are in use.
+                                        if ( e.which === 27 && ! isComposing ) {
+                                                commentReply.revert();
+                                        }
+                                } )
+                                .on( 'compositionstart', function() {
+                                        isComposing = true;
+                                } );
                 }, 600);
 
                 return false;