Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@9217 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-10-16 22:23:32 +00:00
parent 72577aacd8
commit ae2c4bc50c
11 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/edit-comments.php
View File

@ -12,7 +12,7 @@ require_once('admin.php');
$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');

2
wp-admin/edit-pages.php
View File

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

2
wp-admin/edit.php
View File

@ -77,7 +77,7 @@ list($post_stati, $avail_post_stati) = wp_edit_posts_query();
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');

5
wp-admin/includes/comment.php
View File

@ -151,6 +151,11 @@ function floated_admin_avatar( $name ) {
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' );

2
wp-admin/includes/user.php
View File

@ -98,6 +98,8 @@ function edit_user( $user_id = 0 ) {
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;

3
wp-admin/js/edit-comments.js
View File

@ -320,7 +320,8 @@ $(document).ready(function(){
};
$.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')}
);

2
wp-admin/post.php
View File

@ -140,7 +140,7 @@ case 'edit':
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 ) ) {

2
wp-admin/upload.php
View File

@ -140,7 +140,7 @@ if ( isset($_GET['detached']) ) {
if ( is_singular() ) {
wp_enqueue_script( 'admin-comments' );
wp_enqueue_script( 'jquery-table-hotkeys' );
enqueue_comment_hotkeys_js();
}
require_once('admin-header.php'); ?>

4
wp-admin/user-edit.php
View File

@ -220,6 +220,10 @@ foreach ( $_wp_admin_css_colors as $color => $color_info ): ?>
<?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);

4
wp-includes/registration.php
View File

@ -154,6 +154,9 @@ function wp_insert_user($userdata) {
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,6 +186,7 @@ function wp_insert_user($userdata) {
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);

4
wp-includes/script-loader.php
View File

@ -155,7 +155,7 @@ function wp_default_scripts( &$scripts ) {
'good' => __('Medium'),
'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"
'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
@ -435,4 +435,4 @@ add_filter( 'wp_print_scripts', 'wp_just_in_time_script_localization' );
add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' );
add_action( 'wp_default_styles', 'wp_default_styles' );
add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 );
add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 );