Ticket #2552: 2552-debug.diff

wp-admin/list-manipulation.php

@@ -65 +65 @@
                 die('1');
         else    die('0');
         break;
+case 'dim-comment' :
+        if ( !$comment = get_comment( $id ) )
+                die('0');
+        if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
+                die('-1');
+        if ( !current_user_can( 'moderate_comments' ) )
+                die('-1');
+
+        if ( 'unapproved' == wp_get_comment_status($comment->comment_ID) ) {
+                if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) )
+                        die('1');
+        } else {
+                if ( wp_set_comment_status( $comment->comment_ID, 'hold' ) )
+                        die('1');
+        }
+        die('0');
+        break;
 endswitch;
 ?>

wp-admin/wp-admin.css

@@ -326 +326 @@
         color: #009ef0;
 }
 
+.approve {
+        display: none;
+}
+
+.unapproved .approve {
+        display: inline;
+}
+
+.unapproved .unapprove {
+        display: none;
+}
+
 .updated {
         background: #CFEBF7 url(images/notice.gif) no-repeat 1em ;
         border: 1px solid #2580B2;
@@ -951 +963 @@
 #jaxcat {
         margin: 0;
         padding: 0;
-}
- No newline at end of file
+}

wp-admin/edit.php

@@ -114 +114 @@
 <br style="clear:both;" />
 
 <?php
-
 // define the columns to display, the syntax is 'internal name' => 'display name'
 $posts_columns = array(
   'id'         => __('ID'),
@@ -246 +245 @@
         if ($comments) {
         ?> 
 <h3><?php _e('Comments') ?></h3> 
-<ol id="comments"> 
+<ol id="the-list"> 
 <?php
+$i = 0;
 foreach ($comments as $comment) {
-$comment_status = wp_get_comment_status($comment->comment_ID);
+$class = ( ++$i % 2 ) ? array('alternate') : array();
+if ( 'unapproved' == $comment_status = wp_get_comment_status($comment->comment_ID) )
+        $class[] = 'unapproved';
 ?> 
 
-<li <?php if ("unapproved" == $comment_status) echo "class='unapproved'"; ?> >
+<li id='comment-<?php echo $comment->comment_ID; ?>'<?php if ( $class ) echo " class='" . join(' ', $class) . "'"; ?>>
   <?php comment_date('Y-n-j') ?> 
   @
   <?php comment_time('g:m:s a') ?> 
   <?php 
                         if ( current_user_can('edit_post', $post->ID) ) {
-                                echo "[ <a href=\"post.php?action=editcomment&amp;comment=".$comment->comment_ID."\">" .  __('Edit') . "</a>";
-                                echo " - <a href=\"post.php?action=deletecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return confirm('" . sprintf(__("You are about to delete this comment by \'%s\'\\n  \'OK\' to delete, \'Cancel\' to stop."), $comment->comment_author) . "')\">" . __('Delete') . "</a> ";
+                                echo "[ <a href='post.php?action=editcomment&amp;comment=".$comment->comment_ID."\'>" .  __('Edit') . '</a>';
+                                echo ' - <a href="post.php?action=deletecomment&amp;p=' . $post->ID . '&amp;comment=' . $comment->comment_ID . '" onclick="return deleteSomething( \'comment\', ' . $comment->comment_ID . ', \'' . sprintf(__("You are about to delete this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), wp_specialchars($comment->comment_author, 1)) . "' );\">" . __('Delete') . '</a> ';
                                 if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) {
-                                        if ('approved' == wp_get_comment_status($comment->comment_ID)) {
-                                                echo " - <a href=\"post.php?action=unapprovecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">" . __('Unapprove') . "</a> ";
-                                        } else {
-                                                echo " - <a href=\"post.php?action=approvecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">" . __('Approve') . "</a> ";
-                                        }
+                                        echo '<span class="unapprove"> - <a href="comment.php?action=unapprovecomment&amp;p=' . $post->ID . '&amp;comment=' . $comment->comment_ID . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ' );">' . __('Unapprove') . '</a> </span>';
+                                        echo '<span class="approve"> - <a href="comment.php?action=approvecomment&amp;p=' . $post->ID . '&amp;comment=' . $comment->comment_ID . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ' );">' . __('Approve') . '</a> </span>';
                                 }
                                 echo "]";
                         } // end if any comments to show

wp-admin/list-manipulation.js

@@ -14 +14 @@
         }
 }
 
+function dimSomething( what, id ) {
+        return ajaxDelete( 'dim-' + what, id );
+}       
+
 function getResponseElement() {
         var p = document.getElementById('ajax-response-p');
         if (!p) {
@@ -33 +37 @@
         ajaxDel.onLoaded = function() { ajaxDel.myResponseElement.innerHTML = 'Data Sent...'; };
         ajaxDel.onInteractive = function() { ajaxDel.myResponseElement.innerHTML = 'Processing Data...'; };
         ajaxDel.onCompletion = function() { removeThisItem( what.replace('-as-spam', '') + '-' + id ); };
-        ajaxDel.runAJAX('action=delete-' + what + '&id=' + id);
+        ajaxAction = what.match('dim-') ? '' : 'delete-';
+        ajaxDel.runAJAX('action=' +ajaxAction + what + '&id=' + id);
         return false;
 }
 
 function removeThisItem(id) {
+alert('removeThisItem');
+        dimming = false;
+        if ( id.match('dim-') ) { dimming = true; id = id.replace('dim-', ''); }
+alert('dimming: ' + dimming);
         var response = ajaxDel.response;
         if ( isNaN(response) ) { alert(response); }
         response = parseInt(response, 10);
+alert('response: ' + response);
         if ( -1 == response ) { ajaxDel.myResponseElement.innerHTML = "You don't have permission to do that."; }
         else if ( 0 == response ) { ajaxDel.myResponseElement.interHTML = "Something odd happened.  Try refreshing the page? Either that or what you tried to delete never existed in the first place."; }
         else if ( 1 == response ) {
                 theItem = document.getElementById(id);
-                Fat.fade_element(id,null,700,'#FF3333');
-                setTimeout('theItem.parentNode.removeChild(theItem)', 705);
-                var pos = getListPos(id);
-                listItems.splice(pos,1);
-                recolorList(pos);
+alert('theItem');
+                if ( dimming ) {
+alert(theItem.className);
+                        if ( theItem.className.match('unapproved') ) {
+                                Fat.fade_element(id,null,700,null);
+alert('fade');
+                                theItem.className = theItem.className.replace('unapproved', '');
+                        } else {
+                                Fat.fade_element(id,null,700,'#FF3333');
+alert('fade');
+                                theItem.className = theItem.className + ' unapproved';
+                        }
+                } else {
+                        Fat.fade_element(id,null,700,'#FF3333');
+                        setTimeout('theItem.parentNode.removeChild(theItem)', 705);
+                        var pos = getListPos(id);
+                        listItems.splice(pos,1);
+                        recolorList(pos);
+                }
+alert(theItem.className);
                 ajaxDel.myResponseElement.parentNode.removeChild(ajaxDel.myResponseElement);
-
+alert('del0rted');
         }
 }