Changeset 9217

Show
Ignore:
Timestamp:
10/16/08 22:23:32 (3 months ago)
Author:
ryan
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/edit-comments.php

    r9215 r9217  
    1313wp_enqueue_script( 'admin-comments' ); 
    1414wp_enqueue_script( 'admin-forms' ); 
    15 wp_enqueue_script( 'jquery-table-hotkeys' ); 
     15enqueue_comment_hotkeys_js(); 
    1616 
    1717if ( ( isset( $_POST['delete_all_spam'] ) || isset( $_POST['delete_all_spam2'] ) ) && !empty( $_POST['pagegen_timestamp'] ) ) { 

  • trunk/wp-admin/edit-pages.php

    r9122 r9217  
    9696if ( is_singular() ) { 
    9797    wp_enqueue_script( 'admin-comments' ); 
    98     wp_enqueue_script( 'jquery-table-hotkeys' ); 
     98    enqueue_comment_hotkeys_js(); 
    9999} 
    100100 

  • trunk/wp-admin/edit.php

    r9122 r9217  
    7878if ( 1 == count($posts) && is_singular() ) { 
    7979    wp_enqueue_script( 'admin-comments' ); 
    80     wp_enqueue_script( 'jquery-table-hotkeys' ); 
     80    enqueue_comment_hotkeys_js(); 
    8181} 
    8282 

  • trunk/wp-admin/includes/comment.php

    r9119 r9217  
    152152} 
    153153 
     154function enqueue_comment_hotkeys_js() { 
     155    if ( 'true' == get_user_option( 'comment_shortcuts' ) ) 
     156        wp_enqueue_script( 'jquery-table-hotkeys' ); 
     157} 
     158 
    154159if ( is_admin() && ('edit-comments.php' == $pagenow || 'edit.php' == $pagenow) ) { 
    155160    if ( get_option('show_avatars') ) 

  • trunk/wp-admin/includes/user.php

    r9072 r9217  
    9999        $user->rich_editing = 'true'; 
    100100 
     101    $user->comment_shortcuts = isset( $_POST['comment_shortcuts'] )? $_POST['comment_shortcuts'] : '';  
     102     
    101103    $user->use_ssl = 0; 
    102104    if ( !empty($_POST['use_ssl']) ) 

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

    r9162 r9217  
    321321        $.table_hotkeys($('table.widefat'),['a', 'u', 's', 'd', 'r', ['e', edit_comment], 
    322322                ['shift+a', make_bulk('approve')], ['shift+s', make_bulk('markspam')], 
    323                 ['shift+d', make_bulk('delete')], ['shift+x', toggle_all]], 
     323                ['shift+d', make_bulk('delete')], ['shift+x', toggle_all], 
     324                ['shift+u', make_bulk('unapprove')]], 
    324325                {highlight_first: adminCommentsL10n.hotkeys_highlight_first, highlight_last: adminCommentsL10n.hotkeys_highlight_last, 
    325326                prev_page_link_cb: make_hotkeys_redirect('prev'), next_page_link_cb: make_hotkeys_redirect('next')} 

  • trunk/wp-admin/post.php

    r9103 r9217  
    141141    wp_enqueue_script('word-count'); 
    142142    wp_enqueue_script( 'admin-comments' ); 
    143     wp_enqueue_script( 'jquery-table-hotkeys' ); 
     143    enqueue_comment_hotkeys_js(); 
    144144 
    145145    if ( current_user_can('edit_post', $post_ID) ) { 

  • trunk/wp-admin/upload.php

    r9122 r9217  
    141141if ( is_singular() ) { 
    142142    wp_enqueue_script( 'admin-comments' ); 
    143     wp_enqueue_script( 'jquery-table-hotkeys' ); 
     143    enqueue_comment_hotkeys_js(); 
    144144} 
    145145 

  • trunk/wp-admin/user-edit.php

    r9191 r9217  
    220220    <?php endforeach; ?> 
    221221</fieldset></td> 
     222</tr> 
     223<tr> 
     224<th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th> 
     225<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> 
    222226</tr> 
    223227<?php 

  • trunk/wp-includes/registration.php

    r8969 r9217  
    155155        $rich_editing = 'true'; 
    156156 
     157    if ( empty($comment_shortcuts) ) 
     158        $comment_shortcuts = 'false'; 
     159 
    157160    if ( empty($admin_color) ) 
    158161        $admin_color = 'fresh'; 
    …… 
    184187    update_usermeta( $user_id, 'yim', $yim ); 
    185188    update_usermeta( $user_id, 'rich_editing', $rich_editing); 
     189    update_usermeta( $user_id, 'comment_shortcuts', $comment_shortcuts); 
    186190    update_usermeta( $user_id, 'admin_color', $admin_color); 
    187191    update_usermeta( $user_id, 'use_ssl', $use_ssl); 

  • trunk/wp-includes/script-loader.php

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