From 0c1161d915a41d17ebc93ad335a4cd859a7b302e Mon Sep 17 00:00:00 2001 From: Mark Jaquith Date: Fri, 5 Dec 2008 07:15:31 +0000 Subject: [PATCH] Fix Shift-X toggling of comments on Edit Comments git-svn-id: https://develop.svn.wordpress.org/trunk@10063 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/js/common.js | 15 ++++++++++----- wp-admin/js/edit-comments.js | 7 ++++--- wp-includes/script-loader.php | 4 ++-- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/wp-admin/js/common.js b/wp-admin/js/common.js index 1eabc5b033..41c178c504 100644 --- a/wp-admin/js/common.js +++ b/wp-admin/js/common.js @@ -199,16 +199,21 @@ jQuery(document).ready( function($) { lastClicked = this; return true; } ); - $( 'thead :checkbox, tfoot :checkbox' ).click( function(e) { var c = $(this).attr('checked'); - - $(this).parents( 'form:first' ).find( 'table tbody:visible, table thead:visible, table tfoot:visible').find( '.check-column :checkbox' ).attr( 'checked', function() { - if ( e.shiftKey ) + var toggle = e.shiftKey || toggleWithKeyboard; + $(this).parents( 'form:first' ).find( 'table tbody:visible').find( '.check-column :checkbox' ).attr( 'checked', function() { + if ( toggle ) return $(this).attr( 'checked' ) ? '' : 'checked'; else if (c) return 'checked'; - + return ''; + }); + $(this).parents( 'form:first' ).find( 'table thead:visible, table tfoot:visible').find( '.check-column :checkbox' ).attr( 'checked', function() { + if ( toggle ) + return ''; + else if (c) + return 'checked'; return ''; }); }); diff --git a/wp-admin/js/edit-comments.js b/wp-admin/js/edit-comments.js index 36fc82abcc..457a1fa835 100644 --- a/wp-admin/js/edit-comments.js +++ b/wp-admin/js/edit-comments.js @@ -278,7 +278,7 @@ commentReply = { } }; - +toggleWithKeyboard = false; $(document).ready(function(){ columns.init('edit-comments'); commentReply.init(); @@ -299,9 +299,10 @@ $(document).ready(function(){ 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.attr('checked', master_checkbox.attr('checked')? '' : 'checked'); - checkAll('form#comments-form'); + master_checkbox.click().attr('checked', ''); + toggleWithKeyboard = false; } var make_bulk = function(value) { return function(event, _) { diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 6f58b94c1f..72663f5abc 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -41,7 +41,7 @@ function wp_default_scripts( &$scripts ) { $scripts->base_url = $guessurl; $scripts->default_version = get_bloginfo( 'version' ); - $scripts->add( 'common', '/wp-admin/js/common.js', array('jquery', 'hoverIntent'), '20081203' ); + $scripts->add( 'common', '/wp-admin/js/common.js', array('jquery', 'hoverIntent'), '20081205' ); $scripts->add( 'sack', '/wp-includes/js/tw-sack.js', false, '1.6.1' ); $scripts->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '20081103' ); @@ -156,7 +156,7 @@ function wp_default_scripts( &$scripts ) { 'good' => _c('Medium|password strength'), 'strong' => __('Strong') ) ); - $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20081124' ); + $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20081205' ); $scripts->localize( 'admin-comments', 'adminCommentsL10n', array( 'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']), 'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last'])