Changeset 26889

Timestamp:

01/02/2014 12:10:20 AM (11 years ago)

Author:

azaozz

Message:

Comment moderation shortcuts:

• Fix "toggle checkboxes" (shift+x).
• Add noDisable selector and use it to stop disabling the shortcuts when a select-comment checkbox is focused.

See #26755.

Location:

trunk/src

Files:

• wp-admin/js/common.js (modified) (2 diffs)
• wp-admin/js/edit-comments.js (modified) (3 diffs)
• wp-includes/js/jquery/jquery.hotkeys.js (modified) (8 diffs)

trunk/src/wp-admin/js/common.js

@@ -1 @@
-/* global setUserSetting, ajaxurl, commonL10n, alert, confirm, toggleWithKeyboard, pagenow */
+/* global setUserSetting, ajaxurl, commonL10n, alert, confirm, pagenow */
 var showNotice, adminMenu, columns, validateForm, screenMeta;
 ( function( $, window, undefined ) {
@@ -347 +347 @@
     });
 
-    $('thead, tfoot').find('.check-column :checkbox').click( function(e) {
-        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')
-        .prop('checked', function() {
-            if ( $(this).is(':hidden') )
+    $('thead, tfoot').find('.check-column :checkbox').on( 'click.wp-toggle-checkboxes', function( event ) {
+        var $this = $(this),
+            $table = $this.closest( 'table' ),
+            controlChecked = $this.prop('checked'),
+            toggle = event.shiftKey || $this.data('wp-toggle');
+
+        $table.children( 'tbody' ).filter(':visible')
+            .children().children('.check-column').find(':checkbox')
+            .prop('checked', function() {
+                if ( $(this).is(':hidden') ) {
+                    return false;
+                }
+
+                if ( toggle ) {
+                    return ! $(this).prop( 'checked' );
+                } else if ( controlChecked ) {
+                    return true;
+                }
+
                 return false;
-            if ( toggle )
-                return $(this).prop( 'checked' );
-            else if (c)
-                return true;
-            return false;
-        });
-
-        $(this).closest('table').children('thead,  tfoot').filter(':visible')
-        .children().children('.check-column').find(':checkbox')
-        .prop('checked', function() {
-            if ( toggle )
+            });
+
+        $table.children('thead,  tfoot').filter(':visible')
+            .children().children('.check-column').find(':checkbox')
+            .prop('checked', function() {
+                if ( toggle ) {
+                    return false;
+                } else if ( controlChecked ) {
+                    return true;
+                }
+
                 return false;
-            else if (c)
-                return true;
-            return false;
-        });
+            });
     });
 

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

@@ -1 +1 @@
 /* global adminCommentsL10n, thousandsSeparator, list_args, QTags, ajaxurl, wpAjax */
-var setCommentsList, theList, theExtraList, commentReply,
-    toggleWithKeyboard = false;
+var setCommentsList, theList, theExtraList, commentReply;
 
 (function($) {
@@ -595 +594 @@
 
         toggle_all = function() {
-            toggleWithKeyboard = true;
-            $('input:checkbox', '#cb').click().prop('checked', false);
-            toggleWithKeyboard = false;
+            $('#cb-select-all-1').data( 'wp-toggle', 1 ).trigger( 'click' ).removeData( 'wp-toggle' );
         };
 
@@ -610 +607 @@
         $.table_hotkeys(
             $('table.widefat'),
-            ['a', 'u', 's', 'd', 'r', 'q', 'z', ['e', edit_comment], ['shift+x', toggle_all],
-            ['shift+a', make_bulk('approve')], ['shift+s', make_bulk('spam')],
-            ['shift+d', make_bulk('delete')], ['shift+t', make_bulk('trash')],
-            ['shift+z', make_bulk('untrash')], ['shift+u', make_bulk('unapprove')]],
-            { highlight_first: adminCommentsL10n.hotkeys_highlight_first, highlight_last: adminCommentsL10n.hotkeys_highlight_last,
-            prev_page_link_cb: make_hotkeys_redirect('prev'), next_page_link_cb: make_hotkeys_redirect('next') }
+            [
+                'a', 'u', 's', 'd', 'r', 'q', 'z',
+                ['e', edit_comment],
+                ['shift+x', toggle_all],
+                ['shift+a', make_bulk('approve')],
+                ['shift+s', make_bulk('spam')],
+                ['shift+d', make_bulk('delete')],
+                ['shift+t', make_bulk('trash')],
+                ['shift+z', make_bulk('untrash')],
+                ['shift+u', make_bulk('unapprove')]
+            ],
+            {
+                highlight_first: adminCommentsL10n.hotkeys_highlight_first,
+                highlight_last: adminCommentsL10n.hotkeys_highlight_last,
+                prev_page_link_cb: make_hotkeys_redirect('prev'),
+                next_page_link_cb: make_hotkeys_redirect('next'), 
+                hotkeys_opts: {
+                    disableInInput: true,
+                    type: 'keypress',
+                    noDisable: '.check-column input[type="checkbox"]'
+                }
+            }
         );
     }

trunk/src/wp-includes/js/jquery/jquery.hotkeys.js

@@ -1 +1 @@
 /******************************************************************************************************************************
 
- * @ Original idea by by Binny V A, Original version: 2.00.A 
+ * @ Original idea by by Binny V A, Original version: 2.00.A
  * @ http://www.openjs.com/scripts/events/keyboard_shortcuts/
  * @ Original License : BSD
- 
- * @ jQuery Plugin by Tzury Bar Yochay 
+
+ * @ jQuery Plugin by Tzury Bar Yochay
         mail: tzury.by@gmail.com
         blog: evalinux.wordpress.com
         face: facebook.com/profile.php?id=513676303
-        
+
         (c) Copyrights 2007
-        
+
  * @ jQuery Plugin version Beta (0.0.2)
  * @ License: jQuery-License.
- 
+
 TODO:
     add queue support (as in gmail) e.g. 'x' then 'y', etc.
@@ -22 +22 @@
     $.hotkeys.add('Ctrl+c', function(){ alert('copy anyone?');});
     $.hotkeys.add('Ctrl+c', {target:'div#editor', type:'keyup', propagate: true},function(){ alert('copy anyone?');});>
-    $.hotkeys.remove('Ctrl+c'); 
-    $.hotkeys.remove('Ctrl+c', {target:'div#editor', type:'keypress'}); 
-    
+    $.hotkeys.remove('Ctrl+c');
+    $.hotkeys.remove('Ctrl+c', {target:'div#editor', type:'keypress'});
+
 ******************************************************************************************************************************/
 (function (jQuery){
@@ -30 +30 @@
     this.all = {};
     this.special_keys = {
-        27: 'esc', 9: 'tab', 32:'space', 13: 'return', 8:'backspace', 145: 'scroll', 20: 'capslock', 
-        144: 'numlock', 19:'pause', 45:'insert', 36:'home', 46:'del',35:'end', 33: 'pageup', 
-        34:'pagedown', 37:'left', 38:'up', 39:'right',40:'down', 112:'f1',113:'f2', 114:'f3', 
+        27: 'esc', 9: 'tab', 32:'space', 13: 'return', 8:'backspace', 145: 'scroll', 20: 'capslock',
+        144: 'numlock', 19:'pause', 45:'insert', 36:'home', 46:'del',35:'end', 33: 'pageup',
+        34:'pagedown', 37:'left', 38:'up', 39:'right',40:'down', 112:'f1',113:'f2', 114:'f3',
         115:'f4', 116:'f5', 117:'f6', 118:'f7', 119:'f8', 120:'f9', 121:'f10', 122:'f11', 123:'f12'};
-        
-    this.shift_nums = { "`":"~", "1":"!", "2":"@", "3":"#", "4":"$", "5":"%", "6":"^", "7":"&", 
-        "8":"*", "9":"(", "0":")", "-":"_", "=":"+", ";":":", "'":"\"", ",":"<", 
+
+    this.shift_nums = { "`":"~", "1":"!", "2":"@", "3":"#", "4":"$", "5":"%", "6":"^", "7":"&",
+        "8":"*", "9":"(", "0":")", "-":"_", "=":"+", ";":":", "'":"\"", ",":"<",
         ".":">",  "/":"?",  "\\":"|" };
-        
+
     this.add = function(combi, options, callback) {
         if (jQuery.isFunction(options)){
@@ -48 +48 @@
             that = this;
         opt = jQuery.extend( opt , defaults, options || {} );
-        combi = combi.toLowerCase();        
-        
+        combi = combi.toLowerCase();
+
         // inspect if keystroke matches
         var inspector = function(event) {
@@ -58 +58 @@
             // WP: not needed with newer jQuery
             // element = (element.nodeType==3) ? element.parentNode : element;
-            
-            if(opt['disableInInput']) { // Disable shortcut keys in Input, Textarea fields
+
+            if ( opt['disableInInput'] ) { // Disable shortcut keys in Input, Textarea fields
                 var target = jQuery(element);
-                if( target.is("input") || target.is("textarea")){
-                    return;
+
+                if ( ( target.is('input') || target.is('textarea') ) &&
+                    ( ! opt.noDisable || ! target.is( opt.noDisable ) ) ) {
+
+                    return;
                 }
             }
@@ -75 +78 @@
                 propagate = true, // default behaivour
                 mapPoint = null;
-            
+
             // in opera + safari, the event.target is unpredictable.
-            // for example: 'keydown' might be associated with HtmlBodyElement 
+            // for example: 'keydown' might be associated with HtmlBodyElement
             // or the element where you last clicked with your mouse.
-            // WP: needed for all browsers 
+            // WP: needed for all browsers
             // if (jQuery.browser.opera || jQuery.browser.safari){
                 while (!that.all[element] && element.parentNode){
@@ -107 +110 @@
                 }
             }
-        };        
+        };
         // first hook for this element
         if (!this.all[opt.target]){
@@ -115 +118 @@
             this.all[opt.target].events[opt.type] = {callbackMap: {}}
             jQuery.event.add(opt.target, opt.type, inspector);
-        }        
-        this.all[opt.target].events[opt.type].callbackMap[combi] =  {cb: callback, propagate:opt.propagate};                
+        }
+        this.all[opt.target].events[opt.type].callbackMap[combi] =  {cb: callback, propagate:opt.propagate};
         return jQuery;
-    };    
+    };
     this.remove = function(exp, opt) {
         opt = opt || {};
         target = opt.target || jQuery('html')[0];
         type = opt.type || 'keydown';
-        exp = exp.toLowerCase();        
-        delete this.all[target].events[type].callbackMap[exp]        
+        exp = exp.toLowerCase();
+        delete this.all[target].events[type].callbackMap[exp]
         return jQuery;
     };
     jQuery.hotkeys = this;
-    return jQuery;    
+    return jQuery;
 })(jQuery);