WordPress.org
Get WordPress

Make WordPress Core

Changeset 18496


Ignore:
Timestamp:
08/03/2011 01:54:29 AM (13 years ago)
Author:
azaozz
Message:

Optimize script-loader a bit, see #11520

Location:
trunk/wp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-includes/class.wp-scripts.php

    r18480 r18496  
    174174
    175175    function set_group( $handle, $recursion, $group = false ) {
    176         $grp = (int) $this->get_data( $handle, 'group' );
     176
     177        if ( $this->registered[$handle]->args === 1 )
     178            $grp = 1;
     179        else
     180            $grp = (int) $this->get_data( $handle, 'group' );
    177181
    178182        if ( false !== $group && $grp > $group )

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

    r18495 r18496  
    6161    $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20101110' );
    6262
    63     $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20110711' );
    64     $scripts->add_data( 'common', 'group', 1 );
     63    $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20110711', 1 );
    6564    $scripts->add_script_data( 'common', 'commonL10n', array(
    6665        'warnDelete' => __("You are about to permanently delete the selected items.\n  'Cancel' to stop, 'OK' to delete.")
    6766    ) );
    6867
    69     $scripts->add( 'sack', "/wp-includes/js/tw-sack$suffix.js", false, '1.6.1' );
    70     $scripts->add_data( 'sack', 'group', 1 );
    71 
    72     $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", false, '20110502' );
    73     $scripts->add_data( 'quicktags', 'group', 1 );
     68    $scripts->add( 'sack', "/wp-includes/js/tw-sack$suffix.js", false, '1.6.1', 1 );
     69
     70    $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", false, '20110502', 1 );
    7471    $scripts->add_script_data( 'quicktags', 'quicktagsL10n', array(
    7572        'quickLinks' => __('(Quick Links)'),
    … …  
    8885    $scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' );
    8986
    90     $scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array('utils','jquery'), '20110411' );
    91     $scripts->add_data( 'editor', 'group', 1 );
    92 
    93     $scripts->add( 'wp-fullscreen', "/wp-admin/js/wp-fullscreen$suffix.js", array('jquery'), '20110704' );
    94     $scripts->add_data( 'wp-fullscreen', 'group', 1 );
     87    $scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array('utils','jquery'), '20110411', 1 );
     88
     89    $scripts->add( 'wp-fullscreen', "/wp-admin/js/wp-fullscreen$suffix.js", array('jquery'), '20110704', 1 );
    9590
    9691    $scripts->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6.1');
    9792
    98     $scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array('jquery'), '20091119' );
    99     $scripts->add_data( 'wp-ajax-response', 'group', 1 );
     93    $scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array('jquery'), '20091119', 1 );
    10094    $scripts->add_script_data( 'wp-ajax-response', 'wpAjax', array(
    10195        'noPerm' => __('You do not have permission to do that.'),
    … …  
    10397    ) );
    10498
    105     $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), '20110524' );
    106     $scripts->add_data( 'autosave', 'group', 1 );
    107 
    108     $scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array('wp-ajax-response'), '20110521' );
    109     $scripts->add_data( 'wp-lists', 'group', 1 );
     99    $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), '20110524', 1 );
     100
     101    $scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array('wp-ajax-response'), '20110521', 1 );
    110102
    111103    $scripts->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.8.3');
    … …  
    121113    $scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop'), '20070118');
    122114
    123     $scripts->add( 'jquery', '/wp-includes/js/jquery/jquery.js', false, '1.6.1');
    124 
    125     $scripts->add( 'jquery-ui-core', '/wp-includes/js/jquery/ui.core.js', array('jquery'), '1.8.12' );
    126     $scripts->add_data( 'jquery-ui-core', 'group', 1 );
    127 
    128     $scripts->add( 'jquery-ui-position', '/wp-includes/js/jquery/ui.position.js', array('jquery-ui-core'), '1.8.12' );
    129     $scripts->add_data( 'jquery-ui-position', 'group', 1 );
    130 
    131     $scripts->add( 'jquery-ui-widget', '/wp-includes/js/jquery/ui.widget.js', array('jquery-ui-core'), '1.8.12' );
    132     $scripts->add_data( 'jquery-ui-widget', 'group', 1 );
    133 
    134     $scripts->add( 'jquery-ui-mouse', '/wp-includes/js/jquery/ui.mouse.js', array('jquery-ui-widget'), '1.8.12' );
    135     $scripts->add_data( 'jquery-ui-mouse', 'group', 1 );
    136 
    137     $scripts->add( 'jquery-ui-button', '/wp-includes/js/jquery/ui.button.js', array('jquery-ui-core', 'jquery-ui-widget'), '1.8.12' );
    138     $scripts->add_data( 'jquery-ui-button', 'group', 1 );
    139 
    140     $scripts->add( 'jquery-ui-tabs', '/wp-includes/js/jquery/ui.tabs.js', array('jquery-ui-core', 'jquery-ui-widget'), '1.8.12' );
    141     $scripts->add_data( 'jquery-ui-tabs', 'group', 1 );
    142 
    143     $scripts->add( 'jquery-ui-sortable', '/wp-includes/js/jquery/ui.sortable.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.8.12' );
    144     $scripts->add_data( 'jquery-ui-sortable', 'group', 1 );
    145 
    146     $scripts->add( 'jquery-ui-draggable', '/wp-includes/js/jquery/ui.draggable.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.8.12' );
    147     $scripts->add_data( 'jquery-ui-draggable', 'group', 1 );
    148 
    149     $scripts->add( 'jquery-ui-droppable', '/wp-includes/js/jquery/ui.droppable.js', array('jquery-ui-core', 'jquery-ui-mouse', 'jquery-ui-draggable'), '1.8.12' );
    150     $scripts->add_data( 'jquery-ui-droppable', 'group', 1 );
    151 
    152     $scripts->add( 'jquery-ui-selectable', '/wp-includes/js/jquery/ui.selectable.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.8.12' );
    153     $scripts->add_data( 'jquery-ui-selectable', 'group', 1 );
    154 
    155     $scripts->add( 'jquery-ui-resizable', '/wp-includes/js/jquery/ui.resizable.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.8.12' );
    156     $scripts->add_data( 'jquery-ui-resizable', 'group', 1 );
    157 
    158     $scripts->add( 'jquery-ui-dialog', '/wp-includes/js/jquery/ui.dialog.js', array('jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button', 'jquery-ui-position'), '1.8.12' );
    159     $scripts->add_data( 'jquery-ui-dialog', 'group', 1 );
     115    $scripts->add( 'jquery', '/wp-includes/js/jquery/jquery.js', false, '1.6.1' );
     116    $scripts->add( 'jquery-ui-core', '/wp-includes/js/jquery/ui.core.js', array('jquery'), '1.8.12', 1 );
     117    $scripts->add( 'jquery-ui-position', '/wp-includes/js/jquery/ui.position.js', array('jquery-ui-core'), '1.8.12', 1 );
     118    $scripts->add( 'jquery-ui-widget', '/wp-includes/js/jquery/ui.widget.js', array('jquery-ui-core'), '1.8.12', 1 );
     119    $scripts->add( 'jquery-ui-mouse', '/wp-includes/js/jquery/ui.mouse.js', array('jquery-ui-widget'), '1.8.12', 1 );
     120    $scripts->add( 'jquery-ui-button', '/wp-includes/js/jquery/ui.button.js', array('jquery-ui-core', 'jquery-ui-widget'), '1.8.12', 1 );
     121    $scripts->add( 'jquery-ui-tabs', '/wp-includes/js/jquery/ui.tabs.js', array('jquery-ui-core', 'jquery-ui-widget'), '1.8.12', 1 );
     122    $scripts->add( 'jquery-ui-sortable', '/wp-includes/js/jquery/ui.sortable.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.8.12', 1 );
     123    $scripts->add( 'jquery-ui-draggable', '/wp-includes/js/jquery/ui.draggable.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.8.12', 1 );
     124    $scripts->add( 'jquery-ui-droppable', '/wp-includes/js/jquery/ui.droppable.js', array('jquery-ui-core', 'jquery-ui-mouse', 'jquery-ui-draggable'), '1.8.12', 1 );
     125    $scripts->add( 'jquery-ui-selectable', '/wp-includes/js/jquery/ui.selectable.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.8.12', 1 );
     126    $scripts->add( 'jquery-ui-resizable', '/wp-includes/js/jquery/ui.resizable.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.8.12', 1 );
     127    $scripts->add( 'jquery-ui-dialog', '/wp-includes/js/jquery/ui.dialog.js', array('jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button', 'jquery-ui-position'), '1.8.12', 1 );
    160128
    161129    // deprecated, not used in core, most functionality is included in jQuery 1.3
    162     $scripts->add( 'jquery-form', "/wp-includes/js/jquery/jquery.form$suffix.js", array('jquery'), '2.73');
    163     $scripts->add_data( 'jquery-form', 'group', 1 );
    164 
    165     $scripts->add( 'jquery-color', "/wp-includes/js/jquery/jquery.color$suffix.js", array('jquery'), '2.0-4561m');
    166     $scripts->add_data( 'jquery-color', 'group', 1 );
    167 
    168     $scripts->add( 'suggest', "/wp-includes/js/jquery/suggest$suffix.js", array('jquery'), '1.1-20110113');
    169     $scripts->add_data( 'suggest', 'group', 1 );
    170 
    171     $scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20m');
    172     $scripts->add_data( 'schedule', 'group', 1 );
    173 
    174     $scripts->add( 'jquery-query', "/wp-includes/js/jquery/jquery.query.js", array('jquery'), '2.1.7' );
    175     $scripts->add_data( 'jquery-query', 'group', 1 );
    176 
    177     $scripts->add( 'jquery-serialize-object', "/wp-includes/js/jquery/jquery.serialize-object.js", array('jquery'), '0.2' );
    178     $scripts->add_data( 'jquery-serialize-object', 'group', 1 );
    179 
    180     $scripts->add( 'jquery-hotkeys', "/wp-includes/js/jquery/jquery.hotkeys$suffix.js", array('jquery'), '0.0.2m' );
    181     $scripts->add_data( 'jquery-hotkeys', 'group', 1 );
    182 
    183     $scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), '20090102' );
    184     $scripts->add_data( 'jquery-table-hotkeys', 'group', 1 );
    185 
    186     $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20110528');
    187     $scripts->add_data( 'thickbox', 'group', 1 );
     130    $scripts->add( 'jquery-form', "/wp-includes/js/jquery/jquery.form$suffix.js", array('jquery'), '2.73', 1 );
     131
     132    $scripts->add( 'jquery-color', "/wp-includes/js/jquery/jquery.color$suffix.js", array('jquery'), '2.0-4561m', 1 );
     133    $scripts->add( 'suggest', "/wp-includes/js/jquery/suggest$suffix.js", array('jquery'), '1.1-20110113', 1 );
     134    $scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20m', 1 );
     135    $scripts->add( 'jquery-query', "/wp-includes/js/jquery/jquery.query.js", array('jquery'), '2.1.7', 1 );
     136    $scripts->add( 'jquery-serialize-object', "/wp-includes/js/jquery/jquery.serialize-object.js", array('jquery'), '0.2', 1 );
     137    $scripts->add( 'jquery-hotkeys', "/wp-includes/js/jquery/jquery.hotkeys$suffix.js", array('jquery'), '0.0.2m', 1 );
     138    $scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), '20090102', 1 );
     139
     140    $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20110528', 1 );
    188141    $scripts->add_script_data( 'thickbox', 'thickboxL10n', array(
    189142            'next' => __('Next >'),
    … …  
    206159    if ( empty($max_upload_size) )
    207160        $max_upload_size = __('not configured');
    208    
     161
    209162    // error messagoe for both plupload and swfupload
    210163    $uploader_l10n = array(
    … …  
    264217    $scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", false, '2011-02-23');
    265218
    266     $scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), '0.9.6-20110515' );
    267     $scripts->add_data( 'imgareaselect', 'group', 1 );
    268 
    269     $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), '20101027' );
    270     $scripts->add_data( 'password-strength-meter', 'group', 1 );
     219    $scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), '0.9.6-20110515', 1 );
     220
     221    $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), '20101027', 1 );
    271222    $scripts->add_script_data( 'password-strength-meter', 'pwsL10n', array(
    272223        'empty' => __('Strength indicator'),
    … …  
    279230    ) );
    280231
    281     $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20110628' );
    282     $scripts->add_data( 'user-profile', 'group', 1 );
     232    $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20110628', 1 );
    283233
    284234    $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", false, '20110801' );
    285235    $scripts->add_data( 'admin-bar', 'group', 1 );
    286236
    287     $scripts->add( 'wplink', "/wp-includes/js/tinymce/plugins/wplink/js/wplink$suffix.js", array( 'jquery', 'wpdialogs' ), '20110727' );
    288     $scripts->add_data( 'wplink', 'group', 1 );
     237    $scripts->add( 'wplink', "/wp-includes/js/tinymce/plugins/wplink/js/wplink$suffix.js", array( 'jquery', 'wpdialogs' ), '20110727', 1 );
    289238    $scripts->add_script_data( 'wplink', 'wpLinkL10n', array(
    290239        'title' => __('Insert/edit link'),
    … …  
    295244    ) );
    296245
    297     $scripts->add( 'wpdialogs', "/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog$suffix.js", array( 'jquery-ui-dialog' ), '20110528' );
    298     $scripts->add_data( 'wpdialogs', 'group', 1 );
    299 
    300     $scripts->add( 'wpdialogs-popup', "/wp-includes/js/tinymce/plugins/wpdialogs/js/popup$suffix.js", array( 'wpdialogs' ), '20110421' );
    301     $scripts->add_data( 'wpdialogs-popup', 'group', 1 );
     246    $scripts->add( 'wpdialogs', "/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog$suffix.js", array( 'jquery-ui-dialog' ), '20110528', 1 );
     247
     248    $scripts->add( 'wpdialogs-popup', "/wp-includes/js/tinymce/plugins/wpdialogs/js/popup$suffix.js", array( 'wpdialogs' ), '20110421', 1 );
    302249
    303250    if ( is_admin() ) {
    … …  
    309256        ) );
    310257
    311         $scripts->add( 'admin-categories', "/wp-admin/js/categories$suffix.js", array('wp-lists'), '20091201' );
    312         $scripts->add_data( 'admin-categories', 'group', 1 );
    313 
    314         $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array('jquery', 'wp-ajax-response'), '20110429' );
    315         $scripts->add_data( 'admin-tags', 'group', 1 );
     258        $scripts->add( 'admin-categories', "/wp-admin/js/categories$suffix.js", array('wp-lists'), '20091201', 1 );
     259
     260        $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array('jquery', 'wp-ajax-response'), '20110429', 1 );
    316261        $scripts->add_script_data( 'admin-tags', 'tagsl10n', array(
    317262            'noPerm' => __('You do not have permission to do that.'),
    … …  
    319264        ));
    320265
    321         $scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), '20110429' );
    322         $scripts->add_data( 'admin-custom-fields', 'group', 1 );
    323 
    324         $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'jquery-query'), '20110602' );
    325         $scripts->add_data( 'admin-comments', 'group', 1 );
     266        $scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), '20110429', 1 );
     267
     268        $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'jquery-query'), '20110602', 1 );
    326269        $scripts->add_script_data( 'admin-comments', 'adminCommentsL10n', array(
    327270            'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
    … …  
    331274        ) );
    332275
    333         $scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array('jquery'), '20110524' );
    334         $scripts->add_data( 'xfn', 'group', 1 );
    335 
    336         $scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), '20110612' );
    337         $scripts->add_data( 'postbox', 'group', 1 );
    338 
    339         $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox'), '20110524' );
    340         $scripts->add_data( 'post', 'group', 1 );
     276        $scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array('jquery'), '20110524', 1 );
     277
     278        $scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), '20110612', 1 );
     279
     280        $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox'), '20110524', 1 );
    341281        $scripts->add_script_data( 'post', 'postL10n', array(
    342282            'ok' => __('OK'),
    … …  
    360300        ) );
    361301
    362         $scripts->add( 'link', "/wp-admin/js/link$suffix.js", array('wp-lists', 'postbox'), '20110524' );
    363         $scripts->add_data( 'link', 'group', 1 );
     302        $scripts->add( 'link', "/wp-admin/js/link$suffix.js", array('wp-lists', 'postbox'), '20110524', 1 );
    364303
    365304        $scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array('jquery'), '20110429' );
    … …  
    371310        $scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ), '20110414' );
    372311
    373         $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox' ), '20110425' );
    374         $scripts->add_data( 'media-upload', 'group', 1 );
    375 
    376         $scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable' ), '20110601' );
    377         $scripts->add_data( 'admin-widgets', 'group', 1 );
    378 
    379         $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array( 'jquery' ), '20110515' );
    380         $scripts->add_data( 'word-count', 'group', 1 );
    381 
    382         $scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'thickbox' ), '20110118' );
    383         $scripts->add_data( 'theme', 'group', 1 );
    384 
    385         $scripts->add( 'theme-preview', "/wp-admin/js/theme-preview$suffix.js", array( 'thickbox', 'jquery' ), '20100407' );
    386         $scripts->add_data( 'theme-preview', 'group', 1 );
    387 
    388         $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), '20110609' );
    389         $scripts->add_data( 'inline-edit-post', 'group', 1 );
     312        $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox' ), '20110425', 1 );
     313
     314        $scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable' ), '20110601', 1 );
     315
     316        $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array( 'jquery' ), '20110515', 1 );
     317
     318        $scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'thickbox' ), '20110118', 1 );
     319
     320        $scripts->add( 'theme-preview', "/wp-admin/js/theme-preview$suffix.js", array( 'thickbox', 'jquery' ), '20100407', 1 );
     321
     322        $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), '20110609', 1 );
    390323        $scripts->add_script_data( 'inline-edit-post', 'inlineEditL10n', array(
    391324            'error' => __('Error while saving the changes.'),
    … …  
    394327        ) );
    395328
    396         $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery' ), '20110609' );
    397         $scripts->add_data( 'inline-edit-tax', 'group', 1 );
     329        $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery' ), '20110609', 1 );
    398330        $scripts->add_script_data( 'inline-edit-tax', 'inlineEditL10n', array(
    399331            'error' => __('Error while saving the changes.')
    400332        ) );
    401333
    402         $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'thickbox' ), '20110113' );
    403         $scripts->add_data( 'plugin-install', 'group', 1 );
     334        $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'thickbox' ), '20110113', 1 );
    404335        $scripts->add_script_data( 'plugin-install', 'plugininstallL10n', array(
    405336            'plugin_information' => __('Plugin Information:'),
    … …  
    409340        $scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
    410341
    411         $scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), '20110524' );
    412         $scripts->add_data( 'dashboard', 'group', 1 );
    413 
    414         $scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '20090102' );
    415         $scripts->add_data( 'hoverIntent', 'group', 1 );
     342        $scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), '20110524', 1 );
     343
     344        $scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '20090102', 1 );
    416345
    417346        $scripts->add( 'list-revisions', "/wp-includes/js/wp-list-revisions$suffix.js", null, '20091223' );
    418347
    419         $scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery-ui-draggable' ), '20101022' );
    420         $scripts->add_data( 'media', 'group', 1 );
    421 
    422         $scripts->add( 'image-edit', "/wp-admin/js/image-edit$suffix.js", array('jquery', 'json2', 'imgareaselect'), '20110524' );
    423         $scripts->add_data( 'image-edit', 'group', 1 );
    424 
    425         $scripts->add( 'set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array( 'jquery' ), '20100518' );
    426         $scripts->add_data( 'set-post-thumbnail', 'group', 1 );
     348        $scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery-ui-draggable' ), '20101022', 1 );
     349
     350        $scripts->add( 'image-edit', "/wp-admin/js/image-edit$suffix.js", array('jquery', 'json2', 'imgareaselect'), '20110524', 1 );
     351
     352        $scripts->add( 'set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array( 'jquery' ), '20100518', 1 );
    427353        $scripts->add_script_data( 'set-post-thumbnail', 'setPostThumbnailL10n', array(
    428354            'setThumbnail' => __( 'Use as featured image' ),
    … …  
    440366        ) );
    441367
    442         $scripts->add( 'custom-background', "/wp-admin/js/custom-background$suffix.js", array('farbtastic'), '20110511' );
    443         $scripts->add_data( 'custom-background', 'group', 1 );
     368        $scripts->add( 'custom-background', "/wp-admin/js/custom-background$suffix.js", array('farbtastic'), '20110511', 1 );
    444369    }
    445370}
Note: See TracChangeset for help on using the changeset viewer.