Ticket #22164: 22164.diff

wp-admin/edit-comments.php

@@ -102 +102 @@
 $wp_list_table->prepare_items();
 
 wp_enqueue_script('admin-comments');
-enqueue_comment_hotkeys_js();
+wp_enqueue_script('jquery-table-hotkeys');
 
 if ( $post_id )
         $title = sprintf(__('Comments on “%s”'), wp_html_excerpt(_draft_or_post_title($post_id), 50));

wp-admin/includes/screen.php

@@ -904 +904 @@
                         case 'widgets':
                                 $this->_screen_settings = '<p><a id="access-on" href="widgets.php?widgets-access=on">' . __('Enable accessibility mode') . '</a><a id="access-off" href="widgets.php?widgets-access=off">' . __('Disable accessibility mode') . "</a></p>\n";
                                 break;
+                        case 'edit-comments' :
+                                $this->_screen_settings = '<div><label for="comment_shortcuts"><input id="comment_shortcuts" name="comment_shortcuts" type="checkbox" checked="checked" /> ' . __( 'Use comment shortcuts' ) . "</label></div>\n" . $this->_screen_settings;
+                                break;
                 }
 
                 if ( $this->_screen_settings || $this->_options )

wp-admin/js/edit-comments.js

@@ -555 +555 @@
 };
 
 $(document).ready(function(){
-        var make_hotkeys_redirect, edit_comment, toggle_all, make_bulk;
+        var make_hotkeys_redirect, edit_comment, toggle_all, make_bulk,
+                shortcuts = $('#comment_shortcuts'), keys = false;
 
         setCommentsList();
         commentReply.init();
@@ -591 +592 @@
                         }
                 };
 
-                $.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') }
-                );
+                function add_hotkeys() {
+                        if ( keys ) return;
+                        keys = true;
+                        $.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') }
+                        );
+                }
+
+                function remove_hotkeys() {
+                        var r = $.hotkeys.remove;
+                        if ( ! keys ) return;
+                        $('.vim-current').removeClass('vim-current');
+                        keys = false;
+                        r('a'), r('u'), r('s'), r('d'), r('r'), r('q'), r('z'), r('e'), r('shift+x'),
+                        r('shift+a'), r('shift+s'), r('shift+d'), r('shift+t'), r('shift+z'), r('shift+u');
+                }
+
+                shortcuts.change( function(){
+                        if ( $(this).prop('checked') )
+                                add_hotkeys();
+                        else
+                                remove_hotkeys();
+                });
+                if ( shortcuts.prop('checked') ) {
+                        add_hotkeys();
+                        keys = true;
+                }
         }
 });