Ticket #32818: 32818.diff

src/wp-includes/script-loader.php

@@ -474 +474 @@
                         'replyApprove' => __( 'Approve and Reply' ),
                         'reply' => __( 'Reply' ),
                         'warnQuickEdit' => __( "Are you sure you want to edit this comment?\nThe changes you made will be lost." ),
+                        'warnDiscardChanges' => __( "Are you sure you want to do this?\nThe reply changes you made will be lost." ),
                 ) );
 
                 $scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array('jquery'), false, 1 );

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

@@ -495 +495 @@
 commentReply = {
         cid : '',
         act : '',
+        originalContent : '',
 
         init : function() {
                 var row = $('#replyrow');
@@ -578 +579 @@
                 $( '.spinner', replyrow ).removeClass( 'is-active' );
 
                 this.cid = '';
+                this.originalContent = '';
         },
 
         open : function(comment_id, post_id, action) {
@@ -586 +588 @@
                         c = $('#comment-' + comment_id),
                         h = c.height();
 
+                if ( ! this.discardChanges() ) {
+                        // Ask the user to preserve any edits to already open comments
+                        return false;
+                }
+
                 t.close();
                 t.cid = comment_id;
 
@@ -594 +601 @@
                 action = action || 'replyto';
                 act = 'edit' == action ? 'edit' : 'replyto';
                 act = t.act = act + '-comment';
+                t.originalContent = $('textarea.comment', rowData).val();
 
                 $('#action', editRow).val(act);
                 $('#comment_post_ID', editRow).val(post_id);
@@ -766 +774 @@
                         $('table.comments-box').css('display', '');
                         $('#no-comments').remove();
                 });
+        },
+
+        /**
+         * If an open reply has been changed, warn the user they will lose changes
+         * and act on the response.
+         *
+         * @returns {boolean}
+         */
+        discardChanges: function() {
+                var editRow = $( '#replyrow' );
+
+                if  ( this.originalContent === $( '#replycontent', editRow ).val() ) {
+                        return true;
+                }
+
+                return window.confirm( adminCommentsL10n.warnDiscardChanges );
         }
 };
 

src/wp-admin/js/post.js

@@ -268 +268 @@
 
                         if ( typeof commentReply !== 'undefined' ) {
                                 /*
+                                 * Don't submit the edit post if a comment reply has been edited
+                                 * and the user wants to preserve it.
+                                 */
+                                if ( ! commentReply.discardChanges() ) {
+                                        return false;
+                                }
+
+                                /*
                                  * Close the comment edit/reply form if open to stop the form
                                  * action from interfering with the post's form action.
                                  */