Ticket #15898: garyc40-15898-rev3.patch

wp-admin/admin-ajax.php

@@ -661 +661 @@
         $comment_id = wp_new_comment( $commentdata );
         $comment = get_comment($comment_id);
         if ( ! $comment ) die('1');
-
+        
+        $parent = get_comment( $comment_parent );
+        if ( ! $parent->comment_approved && ! wp_update_comment( array( 'comment_ID' => $comment_parent, 'comment_approved' => 'approve' ) ) ) {
+                die('1');
+        }
         $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
 
         $x = new WP_Ajax_Response();

wp-admin/css/wp-admin.dev.css

@@ -1373 +1373 @@
 #comments-form .fixed .column-author {
         width: 20%;
 }
+.comments tr.focus th, .comments tr.focus td {
+        border-top-width:1px;
+        border-top-style:solid;
+}
+
+.comments tr.blur th, .comments tr.blur td {
+        border-bottom-width:0;
+}
 #commentsdiv.postbox .inside {
         line-height:1.4em;
         margin:0;

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

@@ -252 +252 @@
 commentReply = {
         cid : '',
         act : '',
+        
+        showOverlay : function(id) {
+                var c = $('#comment-' + id), 
+                        excluded = c.find('td, th').css('opacity', 1).add('td, th', '#replyrow');
+                listTable.$tbody.find('td, th').not(excluded).animate({opacity:'0.2'}, 300);
+                c.addClass('focus');
+                c.prev().addClass('blur');
+        },
+        
+        hideOverlay : function() {
+                listTable.$tbody.
+                        find('.blur').removeClass('blur').end().
+                        find('.focus').removeClass('focus');
+        },
 
         init : function() {
                 var row = $('#replyrow');
@@ -300 +314 @@
 
                 if ( $('#the-comment-list #replyrow').length < 1 )
                         return false;
+                        
+                listTable.$tbody.find('th, td').animate({opacity : 1}, 300);
 
                 $('#replyrow').fadeOut('fast', function(){
                         commentReply.close();
@@ -323 +339 @@
                         $('input', '#edithead').val('');
                         $('.error', '#replysubmit').html('').hide();
                         $('.waiting', '#replysubmit').hide();
+                        this.hideOverlay();
 
                         if ( $.browser.msie )
                                 $('#replycontainer, #replycontent').css('height', '120px');
@@ -334 +351 @@
         },
 
         open : function(id, p, a) {
-                var t = this, editRow, rowData, act, h, c = $('#comment-' + id);
+                var t = this, editRow, rowData, act, h, c = $('#comment-' + id), replyButton;
                 t.close();
                 t.cid = id;
 
@@ -345 +362 @@
                 $('#action', editRow).val(act);
                 $('#comment_post_ID', editRow).val(p);
                 $('#comment_ID', editRow).val(id);
-
+                t.showOverlay(id);
+                
                 if ( a == 'edit' ) {
                         $('#author', editRow).val( $('div.author', rowData).text() );
                         $('#author-email', editRow).val( $('div.author-email', rowData).text() );
@@ -366 +384 @@
                                 $('#replyrow').fadeIn(300, function(){ $(this).show() });
                         });
                 } else {
+                        replyButton = $('#replybtn', editRow);
                         $('#edithead, #savebtn', editRow).hide();
                         $('#replyhead, #replybtn', editRow).show();
                         c.after(editRow);
+                        if (c.hasClass('unapproved')) {
+                                replyButton.text(adminCommentsL10n.replyApprove);
+                        } else {
+                                replyButton.text(adminCommentsL10n.reply);
+                        }
                         $('#replyrow').fadeIn(300, function(){ $(this).show() });
                 }
 
@@ -406 +430 @@
         },
 
         send : function() {
-                var post = {};
+                var post = {}, c;
 
                 $('#replysubmit .error').hide();
                 $('#replysubmit .waiting').show();
@@ -419 +443 @@
                 post.id = post.comment_post_ID;
                 post.comments_listing = this.comments_listing;
                 post.p = $('[name=p]').val();
-
+                c = $('#comment-' + post.comment_ID);
                 $.ajax({
                         type : 'POST',
                         url : ajaxurl,
                         data : post,
-                        success : function(x) { commentReply.show(x); },
+                        success : function(x) { 
+                                if (c.hasClass('unapproved')) {
+                                        c.removeClass('unapproved').addClass('approved');
+                                }
+                                commentReply.show(x); 
+                        },
                         error : function(r) { commentReply.error(r); }
                 });
 

wp-includes/script-loader.php

@@ -316 +316 @@
                 $scripts->add_data( 'admin-comments', 'group', 1 );
                 $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
                         'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
-                        'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last'])
+                        'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']),
+                        'replyApprove' => __( 'Approve and Reply' ),
+                        'reply' => __( 'Reply' ),
                 ) );
 
                 $scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array('jquery'), '20100403' );