Ticket #7643: hotkeys-opt-in.diff

wp-includes/registration.php

@@ -154 +154 @@
         if ( empty($rich_editing) )
                 $rich_editing = 'true';
 
+        if ( empty($comment_shortcuts) )
+                $comment_shortcuts = 'false';
+
         if ( empty($admin_color) )
                 $admin_color = 'fresh';
         $admin_color = preg_replace('|[^a-z0-9 _.\-@]|i', '', $admin_color);
@@ -183 +186 @@
         update_usermeta( $user_id, 'aim', $aim );
         update_usermeta( $user_id, 'yim', $yim );
         update_usermeta( $user_id, 'rich_editing', $rich_editing);
+        update_usermeta( $user_id, 'comment_shortcuts', $comment_shortcuts);
         update_usermeta( $user_id, 'admin_color', $admin_color);
         update_usermeta( $user_id, 'use_ssl', $use_ssl);
 

wp-admin/edit-comments.php

@@ -12 +12 @@
 $title = __('Edit Comments');
 wp_enqueue_script( 'admin-comments' );
 wp_enqueue_script( 'admin-forms' );
-wp_enqueue_script( 'jquery-table-hotkeys' );
+enqueue_comment_hotkeys_js();
 
 if ( ( isset( $_POST['delete_all_spam'] ) || isset( $_POST['delete_all_spam2'] ) ) && !empty( $_POST['pagegen_timestamp'] ) ) {
         check_admin_referer('bulk-spam-delete');

wp-admin/includes/comment.php

@@ -151 +151 @@
         return "$avatar $name";
 }
 
+function enqueue_comment_hotkeys_js() {
+        if ( 'true' == get_user_option( 'comment_shortcuts' ) )
+                wp_enqueue_script( 'jquery-table-hotkeys' );
+}
+
 if ( is_admin() && ('edit-comments.php' == $pagenow || 'edit.php' == $pagenow) ) {
         if ( get_option('show_avatars') )
                 add_filter( 'comment_author', 'floated_admin_avatar' );

wp-admin/includes/user.php

@@ -98 +98 @@
         else
                 $user->rich_editing = 'true';
 
+        $user->comment_shortcuts = isset( $_POST['comment_shortcuts'] )? $_POST['comment_shortcuts'] : ''; 
+        
         $user->use_ssl = 0;
         if ( !empty($_POST['use_ssl']) )
                 $user->use_ssl = 1;

wp-admin/post.php

@@ -140 +140 @@
         wp_enqueue_script('media-upload');
         wp_enqueue_script('word-count');
         wp_enqueue_script( 'admin-comments' );
-        wp_enqueue_script( 'jquery-table-hotkeys' );
+        enqueue_comment_hotkeys_js();
 
         if ( current_user_can('edit_post', $post_ID) ) {
                 if ( $last = wp_check_post_lock( $post->ID ) ) {

wp-admin/upload.php

@@ -140 +140 @@
 
 if ( is_singular() ) {
         wp_enqueue_script( 'admin-comments' );
-        wp_enqueue_script( 'jquery-table-hotkeys' );
+        enqueue_comment_hotkeys_js();
 }
 
 require_once('admin-header.php'); ?>

wp-admin/edit.php

@@ -77 +77 @@
 
 if ( 1 == count($posts) && is_singular() ) {
         wp_enqueue_script( 'admin-comments' );
-        wp_enqueue_script( 'jquery-table-hotkeys' );
+        enqueue_comment_hotkeys_js();
 }
 
 require_once('admin-header.php');

wp-admin/user-edit.php

@@ -220 +220 @@
         <?php endforeach; ?>
 </fieldset></td>
 </tr>
+<tr>
+<th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
+<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php checked('true', $profileuser->comment_shortcuts); ?> /> <?php _e( 'Enable keyboard shortcuts for comment moderation. <a href="http://codex.wordpress.org/Keyboard_Shortcuts">More information</a>' ); ?></label></td>
+</tr>
 <?php
 endif;
 do_action('personal_options', $profileuser);

wp-admin/edit-pages.php

@@ -95 +95 @@
 
 if ( is_singular() ) {
         wp_enqueue_script( 'admin-comments' );
-        wp_enqueue_script( 'jquery-table-hotkeys' );
+        enqueue_comment_hotkeys_js();
 }
 
 require_once('admin-header.php'); ?>