]> scripts.mit.edu Git - autoinstalls/wordpress.git/blobdiff - wp-admin/js/edit-comments.js
WordPress 3.9.2-scripts
[autoinstalls/wordpress.git] / wp-admin / js / edit-comments.js
index 349a57d73dfdecceab0e7203e279a7a243bb4b87..ff149e19dcca6e58c885a423216b245a94f82e52 100644 (file)
-var theList; var theExtraList;
+/* global adminCommentsL10n, thousandsSeparator, list_args, QTags, ajaxurl, wpAjax */
+var setCommentsList, theList, theExtraList, commentReply;
+
 (function($) {
+var getCount, updateCount, updatePending;
 
 setCommentsList = function() {
-       var dimAfter = function( r, settings ) {
-               var c = $('#' + settings.element);
+       var totalInput, perPageInput, pageInput, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList, diff,
+               lastConfidentTime = 0;
 
-               if ( c.is('.unapproved') )
-                       c.find('div.comment_status').html('0')
-               else
-                       c.find('div.comment_status').html('1')
-
-               $('span.pending-count').each( function() {
-                       var a = $(this);
-                       var n = a.html().replace(/[ ,.]+/g, '');
-                       n = parseInt(n,10);
-                       if ( isNaN(n) ) return;
-                       n = n + ( $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1 );
-                       if ( n < 0 ) { n = 0; }
-                       $('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
-                       n = n.toString();
-                       if ( n.length > 3 )
-                               n = n.substr(0, n.length-3)+' '+n.substr(-3);
-                       a.html(n);
-               });
+       totalInput = $('input[name="_total"]', '#comments-form');
+       perPageInput = $('input[name="_per_page"]', '#comments-form');
+       pageInput = $('input[name="_page"]', '#comments-form');
+
+       dimAfter = function( r, settings ) {
+               var editRow, replyID, replyButton,
+                       c = $( '#' + settings.element );
+
+               editRow = $('#replyrow');
+               replyID = $('#comment_ID', editRow).val();
+               replyButton = $('#replybtn', editRow);
+
+               if ( c.is('.unapproved') ) {
+                       if ( settings.data.id == replyID )
+                               replyButton.text(adminCommentsL10n.replyApprove);
+
+                       c.find('div.comment_status').html('0');
+               } else {
+                       if ( settings.data.id == replyID )
+                               replyButton.text(adminCommentsL10n.reply);
+
+                       c.find('div.comment_status').html('1');
+               }
+
+               diff = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;
+               updatePending( diff );
        };
 
-       var delAfter = function( r, settings ) {
-               $('span.pending-count').each( function() {
-                       var a = $(this);
-                       var n = a.html().replace(/[ ,.]+/g, '');
-                       n = parseInt(n,10);
-                       if ( isNaN(n) ) return;
-                       if ( $('#' + settings.element).is('.unapproved') ) { // we deleted a formerly unapproved comment
-                               n = n - 1;
-                       } else if ( $(settings.target).parents( 'span.unapprove' ).size() ) { // we "deleted" an approved comment from the approved list by clicking "Unapprove"
-                               n = n + 1;
+       // Send current total, page, per_page and url
+       delBefore = function( settings, list ) {
+               var note, id, el, n, h, a, author,
+                       action = false,
+                       wpListsData = $( settings.target ).attr( 'data-wp-lists' );
+
+               settings.data._total = totalInput.val() || 0;
+               settings.data._per_page = perPageInput.val() || 0;
+               settings.data._page = pageInput.val() || 0;
+               settings.data._url = document.location.href;
+               settings.data.comment_status = $('input[name="comment_status"]', '#comments-form').val();
+
+               if ( wpListsData.indexOf(':trash=1') != -1 )
+                       action = 'trash';
+               else if ( wpListsData.indexOf(':spam=1') != -1 )
+                       action = 'spam';
+
+               if ( action ) {
+                       id = wpListsData.replace(/.*?comment-([0-9]+).*/, '$1');
+                       el = $('#comment-' + id);
+                       note = $('#' + action + '-undo-holder').html();
+
+                       el.find('.check-column :checkbox').prop('checked', false); // Uncheck the row so as not to be affected by Bulk Edits.
+
+                       if ( el.siblings('#replyrow').length && commentReply.cid == id )
+                               commentReply.close();
+
+                       if ( el.is('tr') ) {
+                               n = el.children(':visible').length;
+                               author = $('.author strong', el).text();
+                               h = $('<tr id="undo-' + id + '" class="undo un' + action + '" style="display:none;"><td colspan="' + n + '">' + note + '</td></tr>');
+                       } else {
+                               author = $('.comment-author', el).text();
+                               h = $('<div id="undo-' + id + '" style="display:none;" class="undo un' + action + '">' + note + '</div>');
                        }
-                       if ( n < 0 ) { n = 0; }
-                       $('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
-                       n = n.toString();
-                       if ( n.length > 3 )
-                               n = n.substr(0, n.length-3)+' '+n.substr(-3);
-                       a.html(n);
-               });
 
-               $('span.spam-count' ).each( function() {
-                       var a = $(this);
-                       var n = a.html().replace(/[ ,.]+/g, '');
-                       n = parseInt(n,10);
-                       if ( isNaN(n) ) return;
-                       if ( $(settings.target).parents( 'span.spam' ).size() ) { // we marked a comment as spam
-                               n = n + 1;
-                       } else if ( $('#' + settings.element).is('.spam') ) { // we approved or deleted a comment marked as spam
-                               n = n - 1;
+                       el.before(h);
+
+                       $('strong', '#undo-' + id).text(author);
+                       a = $('.undo a', '#undo-' + id);
+                       a.attr('href', 'comment.php?action=un' + action + 'comment&c=' + id + '&_wpnonce=' + settings.data._ajax_nonce);
+                       a.attr('data-wp-lists', 'delete:the-comment-list:comment-' + id + '::un' + action + '=1');
+                       a.attr('class', 'vim-z vim-destructive');
+                       $('.avatar', el).first().clone().prependTo('#undo-' + id + ' .' + action + '-undo-inside');
+
+                       a.click(function(){
+                               list.wpList.del(this);
+                               $('#undo-' + id).css( {backgroundColor:'#ceb'} ).fadeOut(350, function(){
+                                       $(this).remove();
+                                       $('#comment-' + id).css('backgroundColor', '').fadeIn(300, function(){ $(this).show(); });
+                               });
+                               return false;
+                       });
+               }
+
+               return settings;
+       };
+
+       // Updates the current total (stored in the _total input)
+       updateTotalCount = function( total, time, setConfidentTime ) {
+               if ( time < lastConfidentTime )
+                       return;
+
+               if ( setConfidentTime )
+                       lastConfidentTime = time;
+
+               totalInput.val( total.toString() );
+       };
+
+       getCount = function(el) {
+               var n = parseInt( el.html().replace(/[^0-9]+/g, ''), 10 );
+               if ( isNaN(n) )
+                       return 0;
+               return n;
+       };
+
+       updateCount = function(el, n) {
+               var n1 = '';
+               if ( isNaN(n) )
+                       return;
+               n = n < 1 ? '0' : n.toString();
+               if ( n.length > 3 ) {
+                       while ( n.length > 3 ) {
+                               n1 = thousandsSeparator + n.substr(n.length - 3) + n1;
+                               n = n.substr(0, n.length - 3);
                        }
-                       if ( n < 0 ) { n = 0; }
-                       n = n.toString();
-                       if ( n.length > 3 )
-                               n = n.substr(0, n.length-3)+' '+n.substr(-3);
-                       a.html(n);
+                       n = n + n1;
+               }
+               el.html(n);
+       };
+
+       updatePending = function( diff ) {
+               $('span.pending-count').each(function() {
+                       var a = $(this), n = getCount(a) + diff;
+                       if ( n < 1 )
+                               n = 0;
+                       a.closest('.awaiting-mod')[ 0 === n ? 'addClass' : 'removeClass' ]('count-0');
+                       updateCount( a, n );
                });
+       };
+
+       // In admin-ajax.php, we send back the unix time stamp instead of 1 on success
+       delAfter = function( r, settings ) {
+               var total_items_i18n, total, spam, trash, pending,
+                       untrash = $(settings.target).parent().is('span.untrash'),
+                       unspam = $(settings.target).parent().is('span.unspam'),
+                       unapproved = $('#' + settings.element).is('.unapproved');
 
-               if ( theExtraList.size() == 0 || theExtraList.children().size() == 0 ) {
+               function getUpdate(s) {
+                       if ( $(settings.target).parent().is('span.' + s) )
+                               return 1;
+                       else if ( $('#' + settings.element).is('.' + s) )
+                               return -1;
+
+                       return 0;
+               }
+
+               if ( untrash )
+                       trash = -1;
+               else
+                       trash = getUpdate('trash');
+
+               if ( unspam )
+                       spam = -1;
+               else
+                       spam = getUpdate('spam');
+
+               if ( $(settings.target).parent().is('span.unapprove') || ( ( untrash || unspam ) && unapproved ) ) {
+                       // a comment was 'deleted' from another list (e.g. approved, spam, trash) and moved to pending,
+                       // or a trash/spam of a pending comment was undone
+                       pending = 1;
+               } else if ( unapproved ) {
+                       // a pending comment was trashed/spammed/approved
+                       pending = -1;
+               }
+
+               if ( pending )
+                       updatePending(pending);
+
+               $('span.spam-count').each( function() {
+                       var a = $(this), n = getCount(a) + spam;
+                       updateCount(a, n);
+               });
+
+               $('span.trash-count').each( function() {
+                       var a = $(this), n = getCount(a) + trash;
+                       updateCount(a, n);
+               });
+
+               if ( ! $('#dashboard_right_now').length ) {
+                       total = totalInput.val() ? parseInt( totalInput.val(), 10 ) : 0;
+                       if ( $(settings.target).parent().is('span.undo') )
+                               total++;
+                       else
+                               total--;
+
+                       if ( total < 0 )
+                               total = 0;
+
+                       if ( ( 'object' == typeof r ) && lastConfidentTime < settings.parsed.responses[0].supplemental.time ) {
+                               total_items_i18n = settings.parsed.responses[0].supplemental.total_items_i18n || '';
+                               if ( total_items_i18n ) {
+                                       $('.displaying-num').text( total_items_i18n );
+                                       $('.total-pages').text( settings.parsed.responses[0].supplemental.total_pages_i18n );
+                                       $('.tablenav-pages').find('.next-page, .last-page').toggleClass('disabled', settings.parsed.responses[0].supplemental.total_pages == $('.current-page').val());
+                               }
+                               updateTotalCount( total, settings.parsed.responses[0].supplemental.time, true );
+                       } else {
+                               updateTotalCount( total, r, false );
+                       }
+               }
+
+               if ( ! theExtraList || theExtraList.size() === 0 || theExtraList.children().size() === 0 || untrash || unspam ) {
                        return;
                }
 
                theList.get(0).wpList.add( theExtraList.children(':eq(0)').remove().clone() );
-               $('#get-extra-comments').submit();
+
+               refillTheExtraList();
+       };
+
+       refillTheExtraList = function(ev) {
+               var args = $.query.get(), total_pages = $('.total-pages').text(), per_page = $('input[name="_per_page"]', '#comments-form').val();
+
+               if (! args.paged)
+                       args.paged = 1;
+
+               if (args.paged > total_pages) {
+                       return;
+               }
+
+               if (ev) {
+                       theExtraList.empty();
+                       args.number = Math.min(8, per_page); // see WP_Comments_List_Table::prepare_items() @ class-wp-comments-list-table.php
+               } else {
+                       args.number = 1;
+                       args.offset = Math.min(8, per_page) - 1; // fetch only the next item on the extra list
+               }
+
+               args.no_placeholder = true;
+
+               args.paged ++;
+
+               // $.query.get() needs some correction to be sent into an ajax request
+               if ( true === args.comment_type )
+                       args.comment_type = '';
+
+               args = $.extend(args, {
+                       'action': 'fetch-list',
+                       'list_args': list_args,
+                       '_ajax_fetch_list_nonce': $('#_ajax_fetch_list_nonce').val()
+               });
+
+               $.ajax({
+                       url: ajaxurl,
+                       global: false,
+                       dataType: 'json',
+                       data: args,
+                       success: function(response) {
+                               theExtraList.get(0).wpList.add( response.rows );
+                       }
+               });
        };
 
        theExtraList = $('#the-extra-comment-list').wpList( { alt: '', delColor: 'none', addColor: 'none' } );
-       theList = $('#the-comment-list').wpList( { alt: '', dimAfter: dimAfter, delAfter: delAfter, addColor: 'none' } );
+       theList = $('#the-comment-list').wpList( { alt: '', delBefore: delBefore, dimAfter: dimAfter, delAfter: delAfter, addColor: 'none' } )
+               .bind('wpListDelEnd', function(e, s){
+                       var wpListsData = $(s.target).attr('data-wp-lists'), id = s.element.replace(/[^0-9]+/g, '');
 
+                       if ( wpListsData.indexOf(':trash=1') != -1 || wpListsData.indexOf(':spam=1') != -1 )
+                               $('#undo-' + id).fadeIn(300, function(){ $(this).show(); });
+               });
 };
 
-$(document).ready(function(){
-       setCommentsList();
-});
-
 commentReply = {
+       cid : '',
+       act : '',
 
        init : function() {
                var row = $('#replyrow');
 
                $('a.cancel', row).click(function() { return commentReply.revert(); });
-               $('a.save', row).click(function() { return commentReply.send(this); });
+               $('a.save', row).click(function() { return commentReply.send(); });
+               $('input#author, input#author-email, input#author-url', row).keypress(function(e){
+                       if ( e.which == 13 ) {
+                               commentReply.send();
+                               e.preventDefault();
+                               return false;
+                       }
+               });
 
                // add events
                $('#the-comment-list .column-comment > p').dblclick(function(){
-                               commentReply.toggle($(this).parent());
-                       });
+                       commentReply.toggle($(this).parent());
+               });
 
-               $('#doaction, #doaction2, #post-query-submit').click(function(e){
+               $('#doaction, #doaction2, #post-query-submit').click(function(){
                        if ( $('#the-comment-list #replyrow').length > 0 )
-                               t.close();
+                               commentReply.close();
                });
 
+               this.comments_listing = $('#comments-form > input[name="comment_status"]').val() || '';
+
+               /* $(listTable).bind('beforeChangePage', function(){
+                       commentReply.close();
+               }); */
        },
 
        addEvents : function(r) {
@@ -124,73 +330,99 @@ commentReply = {
        },
 
        close : function() {
-               $(this.o).fadeIn('fast').css('backgroundColor', '');
-               $('#com-reply').append( $('#replyrow') );
-               $('#replycontent').val('');
+               var c, replyrow = $('#replyrow');
+
+               // replyrow is not showing?
+               if ( replyrow.parent().is('#com-reply') )
+                       return;
+
+               if ( this.cid && this.act == 'edit-comment' ) {
+                       c = $('#comment-' + this.cid);
+                       c.fadeIn(300, function(){ c.show(); }).css('backgroundColor', '');
+               }
+
+               // reset the Quicktags buttons
+               if ( typeof QTags != 'undefined' )
+                       QTags.closeAllTags('replycontent');
+
+               $('#add-new-comment').css('display', '');
+
+               replyrow.hide();
+               $('#com-reply').append( replyrow );
+               $('#replycontent').css('height', '').val('');
                $('#edithead input').val('');
-               $('#replysubmit .error').html('').hide();
-               $('#replysubmit .waiting').hide();
-               if ( $.browser.msie )
-                       $('#replycontainer, #replycontent').css('height', '120px');
-               else
-                       $('#replycontainer').resizable('destroy').css('height', '120px');
+               $('.error', replyrow).html('').hide();
+               $('.spinner', replyrow).hide();
+
+               this.cid = '';
        },
 
-       open : function(id, p, a) {
-               var t = this;
+       open : function(comment_id, post_id, action) {
+               var editRow, rowData, act, replyButton, editHeight,
+                       t = this,
+                       c = $('#comment-' + comment_id),
+                       h = c.height();
+
                t.close();
-               t.o = '#comment-'+id;
+               t.cid = comment_id;
 
-               $('#replyrow td').attr('colspan', $('.widefat thead th:visible').length);
-               var editRow = $('#replyrow'), rowData = $('#inline-'+id);
-               var act = t.act = (a == 'edit') ? 'edit-comment' : 'replyto-comment';
+               editRow = $('#replyrow');
+               rowData = $('#inline-'+comment_id);
+               action = action || 'replyto';
+               act = 'edit' == action ? 'edit' : 'replyto';
+               act = t.act = act + '-comment';
 
                $('#action', editRow).val(act);
-               $('#comment_post_ID', editRow).val(p);
-               $('#comment_ID', editRow).val(id);
+               $('#comment_post_ID', editRow).val(post_id);
+               $('#comment_ID', editRow).val(comment_id);
 
-               if ( a == 'edit' ) {
+               if ( action == 'edit' ) {
                        $('#author', editRow).val( $('div.author', rowData).text() );
                        $('#author-email', editRow).val( $('div.author-email', rowData).text() );
                        $('#author-url', editRow).val( $('div.author-url', rowData).text() );
                        $('#status', editRow).val( $('div.comment_status', rowData).text() );
                        $('#replycontent', editRow).val( $('textarea.comment', rowData).val() );
                        $('#edithead, #savebtn', editRow).show();
-                       $('#replyhead, #replybtn', editRow).hide();
+                       $('#replyhead, #replybtn, #addhead, #addbtn', editRow).hide();
 
-                       var h = $(t.o).height();
-                       if ( h > 220 )
-                               if ( $.browser.msie )
-                                       $('#replycontainer, #replycontent', editRow).height(h-105);
-                               else
-                                       $('#replycontainer', editRow).height(h-105);
+                       if ( h > 120 ) {
+                               // Limit the maximum height when editing very long comments to make it more manageable.
+                               // The textarea is resizable in most browsers, so the user can adjust it if needed.
+                               editHeight = h > 500 ? 500 : h;
+                               $('#replycontent', editRow).css('height', editHeight + 'px');
+                       }
 
-                       $(t.o).after(editRow.hide()).fadeOut('fast', function(){
-                               $('#replyrow').fadeIn('fast');
+                       c.after( editRow ).fadeOut('fast', function(){
+                               $('#replyrow').fadeIn(300, function(){ $(this).show(); });
                        });
+               } else if ( action == 'add' ) {
+                       $('#addhead, #addbtn', editRow).show();
+                       $('#replyhead, #replybtn, #edithead, #editbtn', editRow).hide();
+                       $('#the-comment-list').prepend(editRow);
+                       $('#replyrow').fadeIn(300);
                } else {
-                       $('#edithead, #savebtn', editRow).hide();
+                       replyButton = $('#replybtn', editRow);
+                       $('#edithead, #savebtn, #addhead, #addbtn', editRow).hide();
                        $('#replyhead, #replybtn', editRow).show();
-                       $(t.o).after(editRow);
-                       $('#replyrow').hide().fadeIn('fast');
-               }
+                       c.after(editRow);
 
-               if ( ! $.browser.msie )
-                       $('#replycontainer').resizable({
-                               handles : 's',
-                               axis : 'y',
-                               minHeight : 80,
-                               stop : function() {
-                                       $('#replycontainer').width('auto');
-                               }
-                       });
+                       if ( c.hasClass('unapproved') ) {
+                               replyButton.text(adminCommentsL10n.replyApprove);
+                       } else {
+                               replyButton.text(adminCommentsL10n.reply);
+                       }
+
+                       $('#replyrow').fadeIn(300, function(){ $(this).show(); });
+               }
 
                setTimeout(function() {
-                       var rtop = $('#replyrow').offset().top;
-                       var rbottom = rtop + $('#replyrow').height();
-                       var scrollTop = window.pageYOffset || document.documentElement.scrollTop;
-                       var vp = document.documentElement.clientHeight || self.innerHeight || 0;
-                       var scrollBottom = scrollTop + vp;
+                       var rtop, rbottom, scrollTop, vp, scrollBottom;
+
+                       rtop = $('#replyrow').offset().top;
+                       rbottom = rtop + $('#replyrow').height();
+                       scrollTop = window.pageYOffset || document.documentElement.scrollTop;
+                       vp = document.documentElement.clientHeight || window.innerHeight || 0;
+                       scrollBottom = scrollTop + vp;
 
                        if ( scrollBottom - 20 < rbottom )
                                window.scroll(0, rbottom - vp + 35);
@@ -198,7 +430,8 @@ commentReply = {
                                window.scroll(0, rtop - 35);
 
                        $('#replycontent').focus().keyup(function(e){
-                               if (e.which == 27) commentReply.revert(); // close on Escape
+                               if ( e.which == 27 )
+                                       commentReply.revert(); // close on Escape
                        });
                }, 600);
 
@@ -208,18 +441,25 @@ commentReply = {
        send : function() {
                var post = {};
 
-               $('#replysubmit .waiting').show();
+               $('#replysubmit .error').hide();
+               $('#replysubmit .spinner').show();
 
-               $('#replyrow input').each(function() {
-                       post[ $(this).attr('name') ] = $(this).val();
+               $('#replyrow input').not(':button').each(function() {
+                       var t = $(this);
+                       post[ t.attr('name') ] = t.val();
                });
 
                post.content = $('#replycontent').val();
                post.id = post.comment_post_ID;
+               post.comments_listing = this.comments_listing;
+               post.p = $('[name="p"]').val();
+
+               if ( $('#comment-' + $('#comment_ID').val()).hasClass('unapproved') )
+                       post.approve_parent = 1;
 
                $.ajax({
                        type : 'POST',
-                       url : wpListL10n.url,
+                       url : ajaxurl,
                        data : post,
                        success : function(x) { commentReply.show(x); },
                        error : function(r) { commentReply.error(r); }
@@ -229,43 +469,63 @@ commentReply = {
        },
 
        show : function(xml) {
+               var t = this, r, c, id, bg, pid;
 
                if ( typeof(xml) == 'string' ) {
-                       this.error({'responseText': xml});
+                       t.error({'responseText': xml});
                        return false;
                }
 
-               var r = wpAjax.parseAjaxResponse(xml);
+               r = wpAjax.parseAjaxResponse(xml);
                if ( r.errors ) {
-                       this.error({'responseText': wpAjax.broken});
+                       t.error({'responseText': wpAjax.broken});
                        return false;
                }
 
-               if ( 'edit-comment' == this.act )
-                       $(this.o).remove();
+               t.revert();
 
                r = r.responses[0];
-               var c = r.data;
+               id = '#comment-' + r.id;
+
+               if ( 'edit-comment' == t.act )
+                       $(id).remove();
+
+               if ( r.supplemental.parent_approved ) {
+                       pid = $('#comment-' + r.supplemental.parent_approved);
+                       updatePending( -1 );
+
+                       if ( this.comments_listing == 'moderated' ) {
+                               pid.animate( { 'backgroundColor':'#CCEEBB' }, 400, function(){
+                                       pid.fadeOut();
+                               });
+                               return;
+                       }
+               }
 
-               $(c).hide()
+               c = $.trim(r.data); // Trim leading whitespaces
+               $(c).hide();
                $('#replyrow').after(c);
-               this.o = id = '#comment-'+r.id;
-               $(id+' .hide-if-no-js').removeClass('hide-if-no-js');
-               this.revert();
-               this.addEvents($(id));
-               var bg = $(id).hasClass('unapproved') ? '#ffffe0' : '#fff';
 
-               $(id)
-                       .animate( { 'backgroundColor':'#CCEEBB' }, 600 )
-                       .animate( { 'backgroundColor': bg }, 600 );
+               id = $(id);
+               t.addEvents(id);
+               bg = id.hasClass('unapproved') ? '#FFFFE0' : id.closest('.widefat, .postbox').css('backgroundColor');
+
+               id.animate( { 'backgroundColor':'#CCEEBB' }, 300 )
+                       .animate( { 'backgroundColor': bg }, 300, function() {
+                               if ( pid && pid.length ) {
+                                       pid.animate( { 'backgroundColor':'#CCEEBB' }, 300 )
+                                               .animate( { 'backgroundColor': bg }, 300 )
+                                               .removeClass('unapproved').addClass('approved')
+                                               .find('div.comment_status').html('1');
+                               }
+                       });
 
-               $.fn.wpList.process($(id))
        },
 
        error : function(r) {
                var er = r.statusText;
 
-               $('#replysubmit .waiting').hide();
+               $('#replysubmit .spinner').hide();
 
                if ( r.responseText )
                        er = r.responseText.replace( /<.[^<>]*?>/g, '' );
@@ -273,46 +533,78 @@ commentReply = {
                if ( er )
                        $('#replysubmit .error').html(er).show();
 
+       },
+
+       addcomment: function(post_id) {
+               var t = this;
+
+               $('#add-new-comment').fadeOut(200, function(){
+                       t.open(0, post_id, 'add');
+                       $('table.comments-box').css('display', '');
+                       $('#no-comments').remove();
+               });
        }
 };
-toggleWithKeyboard = false;
+
 $(document).ready(function(){
-       columns.init('edit-comments');
-       commentReply.init();
+       var make_hotkeys_redirect, edit_comment, toggle_all, make_bulk;
 
-       if ( typeof QTags != 'undefined' )
-               ed_reply = new QTags('ed_reply', 'replycontent', 'replycontainer', 'more');
+       setCommentsList();
+       commentReply.init();
+       $(document).delegate('span.delete a.delete', 'click', function(){return false;});
 
        if ( typeof $.table_hotkeys != 'undefined' ) {
-               var make_hotkeys_redirect = function(which) {
+               make_hotkeys_redirect = function(which) {
                        return function() {
-                               var first_last = 'next' == which? 'first' : 'last';
-                               var l=$('.'+which+'.page-numbers');
+                               var first_last, l;
+
+                               first_last = 'next' == which? 'first' : 'last';
+                               l = $('.tablenav-pages .'+which+'-page:not(.disabled)');
                                if (l.length)
                                        window.location = l[0].href.replace(/\&hotkeys_highlight_(first|last)=1/g, '')+'&hotkeys_highlight_'+first_last+'=1';
-                       }
+                       };
                };
-               var edit_comment = function(event, current_row) {
+
+               edit_comment = function(event, current_row) {
                        window.location = $('span.edit a', current_row).attr('href');
                };
-               var toggle_all = function() {
-                       toggleWithKeyboard = true;
-                       var master_checkbox = $('form#comments-form .check-column :checkbox:first');
-                       master_checkbox.click().attr('checked', '');
-                       toggleWithKeyboard = false;
-               }
-               var make_bulk = function(value) {
-                       return function(event, _) {
-                               $('option[value='+value+']').attr('selected', 'selected');
-                               $('form#comments-form')[0].submit();
-                       }
+
+               toggle_all = function() {
+                       $('#cb-select-all-1').data( 'wp-toggle', 1 ).trigger( 'click' ).removeData( 'wp-toggle' );
+               };
+
+               make_bulk = function(value) {
+                       return function() {
+                               var scope = $('select[name="action"]');
+                               $('option[value="' + value + '"]', scope).prop('selected', true);
+                               $('#doaction').click();
+                       };
                };
-               $.table_hotkeys($('table.widefat'),['a', 'u', 's', 'd', 'r', 'q', ['e', edit_comment],
-                               ['shift+a', make_bulk('approve')], ['shift+s', make_bulk('markspam')],
-                               ['shift+d', make_bulk('delete')], ['shift+x', toggle_all],
-                               ['shift+u', make_bulk('unapprove')]],
-                               {highlight_first: adminCommentsL10n.hotkeys_highlight_first, highlight_last: adminCommentsL10n.hotkeys_highlight_last,
-                               prev_page_link_cb: make_hotkeys_redirect('prev'), next_page_link_cb: make_hotkeys_redirect('next')}
+
+               $.table_hotkeys(
+                       $('table.widefat'),
+                       [
+                               'a', 'u', 's', 'd', 'r', 'q', 'z',
+                               ['e', edit_comment],
+                               ['shift+x', toggle_all],
+                               ['shift+a', make_bulk('approve')],
+                               ['shift+s', make_bulk('spam')],
+                               ['shift+d', make_bulk('delete')],
+                               ['shift+t', make_bulk('trash')],
+                               ['shift+z', make_bulk('untrash')],
+                               ['shift+u', make_bulk('unapprove')]
+                       ],
+                       {
+                               highlight_first: adminCommentsL10n.hotkeys_highlight_first,
+                               highlight_last: adminCommentsL10n.hotkeys_highlight_last,
+                               prev_page_link_cb: make_hotkeys_redirect('prev'),
+                               next_page_link_cb: make_hotkeys_redirect('next'),
+                               hotkeys_opts: {
+                                       disableInInput: true,
+                                       type: 'keypress',
+                                       noDisable: '.check-column input[type="checkbox"]'
+                               }
+                       }
                );
        }
 });