Don't ask for confirmation when marking a comment as spam

git-svn-id: http://svn.automattic.com/wordpress/trunk@10531 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-02-09 22:46:27 +00:00
parent 52d12303ea
commit 605cec9417
3 changed files with 4 additions and 4 deletions

View File

@ -38,7 +38,7 @@ setCommentsList = function() {
settings.data._page = pageInput.val();
settings.data._url = document.location.href;
if ( 'undefined' != showNotice )
if ( 'undefined' != showNotice && settings.data.action && settings.data.action == 'delete-comment' && !settings.data.spam )
return showNotice.warn() ? settings : false;
return settings;
@ -348,7 +348,7 @@ $(document).ready(function(){
setCommentsList();
commentReply.init();
$('.delete a[class^="delete"]').click(function(){return false;});
$('span.delete a.delete').click(function(){return false;});
if ( typeof QTags != 'undefined' )
ed_reply = new QTags('ed_reply', 'replycontent', 'replycontainer', 'more');

File diff suppressed because one or more lines are too long

View File

@ -225,7 +225,7 @@ function wp_default_scripts( &$scripts ) {
'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};'
) );
$scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20090207' );
$scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20090209' );
$scripts->add_data( 'admin-comments', 'group', 1 );
$scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),