Fix select all checkboxes JS function, another .attr() vs .prop() case in jQuery 1.6.1, fixes #17527

git-svn-id: http://svn.automattic.com/wordpress/trunk@17979 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-05-20 22:47:36 +00:00
parent 7c4f97f677
commit a34fe128c2
3 changed files with 15 additions and 15 deletions

View File

@ -276,30 +276,30 @@ $(document).ready( function() {
});
$('thead, tfoot').find('.check-column :checkbox').click( function(e) {
var c = $(this).attr('checked'),
var c = $(this).prop('checked'),
kbtoggle = 'undefined' == typeof toggleWithKeyboard ? false : toggleWithKeyboard,
toggle = e.shiftKey || kbtoggle;
$(this).closest( 'table' ).children( 'tbody' ).filter(':visible')
.children().children('.check-column').find(':checkbox')
.attr('checked', function() {
.prop('checked', function() {
if ( $(this).closest('tr').is(':hidden') )
return '';
return false;
if ( toggle )
return $(this).attr( 'checked' ) ? '' : 'checked';
return $(this).prop( 'checked' );
else if (c)
return 'checked';
return '';
return true;
return false;
});
$(this).closest('table').children('thead, tfoot').filter(':visible')
.children().children('.check-column').find(':checkbox')
.attr('checked', function() {
.prop('checked', function() {
if ( toggle )
return '';
return false;
else if (c)
return 'checked';
return '';
return true;
return false;
});
});
@ -310,7 +310,7 @@ $(document).ready( function() {
});
// tab in textareas
$('#newcontent').keydown(function(e) {
$('#newcontent').bind('keydown.wpevent_InsertTab', function(e) {
if ( e.keyCode != 9 )
return true;
@ -337,10 +337,10 @@ $(document).ready( function() {
e.preventDefault();
});
$('#newcontent').blur(function(e) {
$('#newcontent').bind('blur.wpevent_InsertTab', function(e) {
if ( this.lastKey && 9 == this.lastKey )
this.focus();
});
});
})(jQuery);
})(jQuery);

File diff suppressed because one or more lines are too long

View File

@ -64,7 +64,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20101110' );
$scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20110510' );
$scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20110520' );
$scripts->add_data( 'common', 'group', 1 );
$scripts->localize( 'common', 'commonL10n', array(
'warnDelete' => __("You are about to permanently delete the selected items.\n 'Cancel' to stop, 'OK' to delete."),