Changeset 9217

Timestamp:

10/16/2008 10:23:32 PM (18 years ago)

Author:

ryan

Message:

Add opt-in optioon for comment hotkeys. Props nbachiyski. fixes #7643

Location:

trunk

Files:

• wp-admin/edit-comments.php (modified) (1 diff)
• wp-admin/edit-pages.php (modified) (1 diff)
• wp-admin/edit.php (modified) (1 diff)
• wp-admin/includes/comment.php (modified) (1 diff)
• wp-admin/includes/user.php (modified) (1 diff)
• wp-admin/js/edit-comments.js (modified) (1 diff)
• wp-admin/post.php (modified) (1 diff)
• wp-admin/upload.php (modified) (1 diff)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-includes/registration.php (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/edit-comments.php

@@ -13 +13 @@
 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'] ) ) {

trunk/wp-admin/edit-pages.php

@@ -96 +96 @@
 if ( is_singular() ) {
     wp_enqueue_script( 'admin-comments' );
-    wp_enqueue_script( 'jquery-table-hotkeys' );
+    enqueue_comment_hotkeys_js();
 }
 

trunk/wp-admin/edit.php

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

trunk/wp-admin/includes/comment.php

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

trunk/wp-admin/includes/user.php

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

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

@@ -321 +321 @@
         $.table_hotkeys($('table.widefat'),['a', 'u', 's', 'd', 'r', ['e', edit_comment],
                 ['shift+a', make_bulk('approve')], ['shift+s', make_bulk('markspam')],
-                ['shift+d', make_bulk('delete')], ['shift+x', toggle_all]],
+                ['shift+d', make_bulk('delete')], ['shift+x', toggle_all],
+                ['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')}

trunk/wp-admin/post.php

@@ -141 +141 @@
     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) ) {

trunk/wp-admin/upload.php

@@ -141 +141 @@
 if ( is_singular() ) {
     wp_enqueue_script( 'admin-comments' );
-    wp_enqueue_script( 'jquery-table-hotkeys' );
+    enqueue_comment_hotkeys_js();
 }
 

trunk/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

trunk/wp-includes/registration.php

@@ -155 +155 @@
         $rich_editing = 'true';
 
+    if ( empty($comment_shortcuts) )
+        $comment_shortcuts = 'false';
+
     if ( empty($admin_color) )
         $admin_color = 'fresh';
@@ -184 +187 @@
     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);

trunk/wp-includes/script-loader.php

@@ -156 +156 @@
             'strong' => __('Strong')
         ) );
-        $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'columns', 'settings-box'), '20081014' );
+        $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'columns', 'settings-box'), '20081016' );
         $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
             'pending' => __('%i% pending'), // must look like: "# blah blah"