Changeset 10063

Timestamp:

12/05/2008 07:15:31 AM (18 years ago)

Author:

markjaquith

Message:

Fix Shift-X toggling of comments on Edit Comments

Location:

trunk

Files:

• wp-admin/js/common.js (modified) (1 diff)
• wp-admin/js/edit-comments.js (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/js/common.js

@@ -200 +200 @@
                 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 '';
                 });

trunk/wp-admin/js/edit-comments.js

@@ -279 +279 @@
         }
 };
-
+toggleWithKeyboard = false;
 $(document).ready(function(){
         columns.init('edit-comments');
@@ -300 +300 @@
                 };
                 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) {

trunk/wp-includes/script-loader.php

@@ -42 +42 @@
         $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' );
 
@@ -157 +157 @@
                         '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']),