From adb001a76c11c2998f473b4d2acf0fcecdf2c930 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Sun, 7 Dec 2008 09:04:38 +0000 Subject: [PATCH] Don't select hidden rows' checkboxes when selecting all, fixes #8520 git-svn-id: https://develop.svn.wordpress.org/trunk@10107 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/js/common.js | 10 +++++++++- wp-includes/script-loader.php | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/wp-admin/js/common.js b/wp-admin/js/common.js index fa781ca5db..8f3375cb4f 100644 --- a/wp-admin/js/common.js +++ b/wp-admin/js/common.js @@ -192,8 +192,14 @@ jQuery(document).ready( function($) { var checks = $( lastClicked ).parents( 'form:first' ).find( ':checkbox' ); var first = checks.index( lastClicked ); var last = checks.index( this ); + var checked = $(this).attr('checked'); if ( 0 < first && 0 < last && first != last ) { - checks.slice( first, last ).attr( 'checked', $( this ).is( ':checked' ) ? 'checked' : '' ); + checks.slice( first, last ).attr( 'checked', function(){ + if ( $(this).parents('tr').is(':visible') ) + return checked ? 'checked' : ''; + + return ''; + }); } } lastClicked = this; @@ -205,6 +211,8 @@ jQuery(document).ready( function($) { toggleWithKeyboard = false; var toggle = e.shiftKey || toggleWithKeyboard; $(this).parents( 'form:first' ).find( 'table tbody:visible').find( '.check-column :checkbox' ).attr( 'checked', function() { + if ( $(this).parents('tr').is(':hidden') ) + return ''; if ( toggle ) return $(this).attr( 'checked' ) ? '' : 'checked'; else if (c) diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index c23b9ca379..07f7e92f48 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'), '20081206' ); + $scripts->add( 'common', '/wp-admin/js/common.js', array('jquery', 'hoverIntent'), '20081206b' ); $scripts->add( 'sack', '/wp-includes/js/tw-sack.js', false, '1.6.1' ); $scripts->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '20081103' );