Changeset 9868

Timestamp:

11/25/2008 02:41:54 AM (16 years ago)

Author:

azaozz

Message:

Fix QE and Reply actions on comments that come in via infinite comment stream

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (2 diffs)
• wp-admin/js/edit-comments.js (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -466 +466 @@
         get_comment( $comment );
         ob_start();
-            _wp_comment_row( $comment->comment_ID, $mode, $status );
+            _wp_comment_row( $comment->comment_ID, $mode, $status, true, true );
             $comment_list_item = ob_get_contents();
         ob_end_clean();

trunk/wp-admin/includes/template.php

@@ -1918 +1918 @@
  * @param unknown_type $checkbox
  */
-function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true ) {
+function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true, $from_ajax = false ) {
     global $comment, $post;
     $comment = get_comment( $comment_id );
@@ -2008 +2008 @@
                         ( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
 
-                        // Reply and quickedit need a hide-if-no-js span
-                        if ( 'reply' == $action || 'quickedit' == $action )
+                        // Reply and quickedit need a hide-if-no-js span when not added with ajax
+                        if ( ('reply' == $action || 'quickedit' == $action) && ! $from_ajax )
                             $action .= ' hide-if-no-js';
 

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

@@ -82 +82 @@
 
     init : function() {
-        this.rows = $('#the-comment-list tr');
-        if ( !this.rows.size() )
-            this.rows = $('#the-comment-list > div.comment-item');
         var row = $('#replyrow');
 

trunk/wp-includes/script-loader.php

@@ -157 +157 @@
             'strong' => __('Strong')
         ) );
-        $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20081117' );
+        $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20081124' );
         $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
             'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),