WordPress 3.4.1
[autoinstalls/wordpress.git] / wp-includes / script-loader.php
index 62256dfef7856de9eeede77798e37f042ea0a3a2..28b4edbecb542cf8264336e3c4255143dd90896e 100644 (file)
@@ -8,8 +8,8 @@
  * file.
  *
  * Several constants are used to manage the loading, concatenating and compression of scripts and CSS:
- * define('SCRIPT_DEBUG', true); loads the development (non-minified) versions of all scripts and disables compression and concatenation
- * define('CONCATENATE_SCRIPTS', false); disables compression and concatenation,
+ * define('SCRIPT_DEBUG', true); loads the development (non-minified) versions of all scripts and CSS, and disables compression and concatenation,
+ * define('CONCATENATE_SCRIPTS', false); disables compression and concatenation of scripts and CSS,
  * define('COMPRESS_SCRIPTS', false); disables compression of scripts,
  * define('COMPRESS_CSS', false); disables compression of CSS,
  * define('ENFORCE_GZIP', true); forces gzip for compression (default is deflate).
@@ -37,10 +37,11 @@ require( ABSPATH . WPINC . '/class.wp-styles.php' );
 require( ABSPATH . WPINC . '/functions.wp-styles.php' );
 
 /**
- * Setup WordPress scripts to load by default for Administration Panels.
+ * Register all WordPress scripts.
  *
- * Localizes a few of the scripts.
- * $scripts->add_data( 'script-handle', 'group', 1 ); queues the script for the footer
+ * Localizes some of them.
+ * args order: $scripts->add( 'handle', 'url', 'dependencies', 'query-string', 1 );
+ * when last arg === 1 queues the script for the footer
  *
  * @since 2.6.0
  *
@@ -58,21 +59,17 @@ function wp_default_scripts( &$scripts ) {
 
        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
 
-       $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20090102' );
+       $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js" );
 
-       $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20090609' );
-       $scripts->add_data( 'common', 'group', 1 );
-       $scripts->localize( 'common', 'commonL10n', array(
-               'warnDelete' => __("You are about to delete the selected items.\n  'Cancel' to stop, 'OK' to delete."),
-               'l10n_print_after' => 'try{convertEntities(commonL10n);}catch(e){};'
+       $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), false, 1 );
+       did_action( 'init' ) && $scripts->localize( 'common', 'commonL10n', array(
+               'warnDelete' => __("You are about to permanently delete the selected items.\n  'Cancel' to stop, 'OK' to delete.")
        ) );
 
-       $scripts->add( 'sack', "/wp-includes/js/tw-sack$suffix.js", false, '1.6.1' );
-       $scripts->add_data( 'sack', 'group', 1 );
+       $scripts->add( 'sack', "/wp-includes/js/tw-sack$suffix.js", array(), '1.6.1', 1 );
 
-       $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", false, '20090307' );
-       $scripts->localize( 'quicktags', 'quicktagsL10n', array(
-               'quickLinks' => __('(Quick Links)'),
+       $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", array(), false, 1 );
+       did_action( 'init' ) && $scripts->localize( 'quicktags', 'quicktagsL10n', array(
                'wordLookup' => __('Enter a word to look up:'),
                'dictionaryLookup' => esc_attr(__('Dictionary lookup')),
                'lookup' => esc_attr(__('lookup')),
@@ -81,198 +78,270 @@ function wp_default_scripts( &$scripts ) {
                'enterURL' => __('Enter the URL'),
                'enterImageURL' => __('Enter the URL of the image'),
                'enterImageDescription' => __('Enter a description of the image'),
-               'l10n_print_after' => 'try{convertEntities(quicktagsL10n);}catch(e){};'
+               'fullscreen' => __('fullscreen'),
+               'toggleFullscreen' => esc_attr( __('Toggle fullscreen mode') ),
+               'textdirection' => esc_attr( __('text direction') ),
+               'toggleTextdirection' => esc_attr( __('Toggle Editor Text Direction') )
        ) );
 
        $scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' );
 
-       $scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", false, '20090503' );
+       $scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array('utils','jquery'), false, 1 );
 
-       $scripts->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6');
+       $scripts->add( 'wp-fullscreen', "/wp-admin/js/wp-fullscreen$suffix.js", array('jquery'), false, 1 );
 
-       $scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array('jquery'), '20090128' );
-       $scripts->add_data( 'wp-ajax-response', 'group', 1 );
-       $scripts->localize( 'wp-ajax-response', 'wpAjax', array(
+       $scripts->add( 'prototype', '/wp-includes/js/prototype.js', array(), '1.6.1');
+
+       $scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array('jquery'), false, 1 );
+       did_action( 'init' ) && $scripts->localize( 'wp-ajax-response', 'wpAjax', array(
                'noPerm' => __('You do not have permission to do that.'),
-               'broken' => __('An unidentified error has occurred.'),
-               'l10n_print_after' => 'try{convertEntities(wpAjax);}catch(e){};'
+               'broken' => __('An unidentified error has occurred.')
        ) );
 
-       $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), '20090526' );
-       $scripts->add_data( 'autosave', 'group', 1 );
-
-       $scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array('wp-ajax-response'), '20090504' );
-       $scripts->add_data( 'wp-lists', 'group', 1 );
-       $scripts->localize( 'wp-lists', 'wpListL10n', array(
-               'url' => admin_url('admin-ajax.php')
+       $scripts->add( 'wp-pointer', "/wp-includes/js/wp-pointer$suffix.js", array( 'jquery-ui-widget', 'jquery-ui-position' ), '20111129a', 1 );
+       did_action( 'init' ) && $scripts->localize( 'wp-pointer', 'wpPointerL10n', array(
+               'dismiss' => __('Dismiss'),
        ) );
 
-       $scripts->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.8.0');
-       $scripts->add( 'scriptaculous-builder', '/wp-includes/js/scriptaculous/builder.js', array('scriptaculous-root'), '1.8.0');
-       $scripts->add( 'scriptaculous-dragdrop', '/wp-includes/js/scriptaculous/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.8.0');
-       $scripts->add( 'scriptaculous-effects', '/wp-includes/js/scriptaculous/effects.js', array('scriptaculous-root'), '1.8.0');
-       $scripts->add( 'scriptaculous-slider', '/wp-includes/js/scriptaculous/slider.js', array('scriptaculous-effects'), '1.8.0');
-       $scripts->add( 'scriptaculous-sound', '/wp-includes/js/scriptaculous/sound.js', array( 'scriptaculous-root' ), '1.8.0' );
-       $scripts->add( 'scriptaculous-controls', '/wp-includes/js/scriptaculous/controls.js', array('scriptaculous-root'), '1.8.0');
-       $scripts->add( 'scriptaculous', '', array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls'), '1.8.0');
-
-       $scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop'), '20070118');
-
-       $scripts->add( 'jquery', '/wp-includes/js/jquery/jquery.js', false, '1.3.2');
-
-       $scripts->add( 'jquery-ui-core', '/wp-includes/js/jquery/ui.core.js', array('jquery'), '1.7.1' );
-       $scripts->add_data( 'jquery-ui-core', 'group', 1 );
-
-       $scripts->add( 'jquery-ui-tabs', '/wp-includes/js/jquery/ui.tabs.js', array('jquery-ui-core'), '1.7.1' );
-       $scripts->add_data( 'jquery-ui-tabs', 'group', 1 );
-
-       $scripts->add( 'jquery-ui-sortable', '/wp-includes/js/jquery/ui.sortable.js', array('jquery-ui-core'), '1.7.1' );
-       $scripts->add_data( 'jquery-ui-sortable', 'group', 1 );
-
-       $scripts->add( 'jquery-ui-draggable', '/wp-includes/js/jquery/ui.draggable.js', array('jquery-ui-core'), '1.7.1' );
-       $scripts->add_data( 'jquery-ui-draggable', 'group', 1 );
-
-       $scripts->add( 'jquery-ui-droppable', '/wp-includes/js/jquery/ui.droppable.js', array('jquery-ui-core'), '1.7.1' );
-       $scripts->add_data( 'jquery-ui-droppable', 'group', 1 );
-
-       $scripts->add( 'jquery-ui-selectable', '/wp-includes/js/jquery/ui.selectable.js', array('jquery-ui-core'), '1.7.1' );
-       $scripts->add_data( 'jquery-ui-selectable', 'group', 1 );
-
-       $scripts->add( 'jquery-ui-resizable', '/wp-includes/js/jquery/ui.resizable.js', array('jquery-ui-core'), '1.7.1' );
-       $scripts->add_data( 'jquery-ui-resizable', 'group', 1 );
+       $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), false, 1 );
+
+       $scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array('wp-ajax-response'), false, 1 );
+
+       $scripts->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.8.3');
+       $scripts->add( 'scriptaculous-builder', '/wp-includes/js/scriptaculous/builder.js', array('scriptaculous-root'), '1.8.3');
+       $scripts->add( 'scriptaculous-dragdrop', '/wp-includes/js/scriptaculous/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.8.3');
+       $scripts->add( 'scriptaculous-effects', '/wp-includes/js/scriptaculous/effects.js', array('scriptaculous-root'), '1.8.3');
+       $scripts->add( 'scriptaculous-slider', '/wp-includes/js/scriptaculous/slider.js', array('scriptaculous-effects'), '1.8.3');
+       $scripts->add( 'scriptaculous-sound', '/wp-includes/js/scriptaculous/sound.js', array( 'scriptaculous-root' ), '1.8.3' );
+       $scripts->add( 'scriptaculous-controls', '/wp-includes/js/scriptaculous/controls.js', array('scriptaculous-root'), '1.8.3');
+       $scripts->add( 'scriptaculous', '', array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls'), '1.8.3');
+
+       // not used in core, replaced by Jcrop.js
+       $scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop') );
+
+       $scripts->add( 'jquery', '/wp-includes/js/jquery/jquery.js', array(), '1.7.2' );
+
+       // full jQuery UI
+       $scripts->add( 'jquery-ui-core', '/wp-includes/js/jquery/ui/jquery.ui.core.min.js', array('jquery'), '1.8.20', 1 );
+       $scripts->add( 'jquery-effects-core', '/wp-includes/js/jquery/ui/jquery.effects.core.min.js', array('jquery'), '1.8.20', 1 );
+
+       $scripts->add( 'jquery-effects-blind', '/wp-includes/js/jquery/ui/jquery.effects.blind.min.js', array('jquery-effects-core'), '1.8.20', 1 );
+       $scripts->add( 'jquery-effects-bounce', '/wp-includes/js/jquery/ui/jquery.effects.bounce.min.js', array('jquery-effects-core'), '1.8.20', 1 );
+       $scripts->add( 'jquery-effects-clip', '/wp-includes/js/jquery/ui/jquery.effects.clip.min.js', array('jquery-effects-core'), '1.8.20', 1 );
+       $scripts->add( 'jquery-effects-drop', '/wp-includes/js/jquery/ui/jquery.effects.drop.min.js', array('jquery-effects-core'), '1.8.20', 1 );
+       $scripts->add( 'jquery-effects-explode', '/wp-includes/js/jquery/ui/jquery.effects.explode.min.js', array('jquery-effects-core'), '1.8.20', 1 );
+       $scripts->add( 'jquery-effects-fade', '/wp-includes/js/jquery/ui/jquery.effects.fade.min.js', array('jquery-effects-core'), '1.8.20', 1 );
+       $scripts->add( 'jquery-effects-fold', '/wp-includes/js/jquery/ui/jquery.effects.fold.min.js', array('jquery-effects-core'), '1.8.20', 1 );
+       $scripts->add( 'jquery-effects-highlight', '/wp-includes/js/jquery/ui/jquery.effects.highlight.min.js', array('jquery-effects-core'), '1.8.20', 1 );
+       $scripts->add( 'jquery-effects-pulsate', '/wp-includes/js/jquery/ui/jquery.effects.pulsate.min.js', array('jquery-effects-core'), '1.8.20', 1 );
+       $scripts->add( 'jquery-effects-scale', '/wp-includes/js/jquery/ui/jquery.effects.scale.min.js', array('jquery-effects-core'), '1.8.20', 1 );
+       $scripts->add( 'jquery-effects-shake', '/wp-includes/js/jquery/ui/jquery.effects.shake.min.js', array('jquery-effects-core'), '1.8.20', 1 );
+       $scripts->add( 'jquery-effects-slide', '/wp-includes/js/jquery/ui/jquery.effects.slide.min.js', array('jquery-effects-core'), '1.8.20', 1 );
+       $scripts->add( 'jquery-effects-transfer', '/wp-includes/js/jquery/ui/jquery.effects.transfer.min.js', array('jquery-effects-core'), '1.8.20', 1 );
+
+       $scripts->add( 'jquery-ui-accordion', '/wp-includes/js/jquery/ui/jquery.ui.accordion.min.js', array('jquery-ui-core', 'jquery-ui-widget'), '1.8.20', 1 );
+       $scripts->add( 'jquery-ui-autocomplete', '/wp-includes/js/jquery/ui/jquery.ui.autocomplete.min.js', array('jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position'), '1.8.20', 1 );
+       $scripts->add( 'jquery-ui-button', '/wp-includes/js/jquery/ui/jquery.ui.button.min.js', array('jquery-ui-core', 'jquery-ui-widget'), '1.8.20', 1 );
+       $scripts->add( 'jquery-ui-datepicker', '/wp-includes/js/jquery/ui/jquery.ui.datepicker.min.js', array('jquery-ui-core'), '1.8.20', 1 );
+       $scripts->add( 'jquery-ui-dialog', '/wp-includes/js/jquery/ui/jquery.ui.dialog.min.js', array('jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button', 'jquery-ui-position'), '1.8.20', 1 );
+       $scripts->add( 'jquery-ui-draggable', '/wp-includes/js/jquery/ui/jquery.ui.draggable.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.8.20', 1 );
+       $scripts->add( 'jquery-ui-droppable', '/wp-includes/js/jquery/ui/jquery.ui.droppable.min.js', array('jquery-ui-draggable'), '1.8.20', 1 );
+       $scripts->add( 'jquery-ui-mouse', '/wp-includes/js/jquery/ui/jquery.ui.mouse.min.js', array('jquery-ui-widget'), '1.8.20', 1 );
+       $scripts->add( 'jquery-ui-position', '/wp-includes/js/jquery/ui/jquery.ui.position.min.js', array('jquery'), '1.8.20', 1 );
+       $scripts->add( 'jquery-ui-progressbar', '/wp-includes/js/jquery/ui/jquery.ui.progressbar.min.js', array('jquery-ui-widget'), '1.8.20', 1 );
+       $scripts->add( 'jquery-ui-resizable', '/wp-includes/js/jquery/ui/jquery.ui.resizable.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.8.20', 1 );
+       $scripts->add( 'jquery-ui-selectable', '/wp-includes/js/jquery/ui/jquery.ui.selectable.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.8.20', 1 );
+       $scripts->add( 'jquery-ui-slider', '/wp-includes/js/jquery/ui/jquery.ui.slider.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.8.20', 1 );
+       $scripts->add( 'jquery-ui-sortable', '/wp-includes/js/jquery/ui/jquery.ui.sortable.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.8.20', 1 );
+       $scripts->add( 'jquery-ui-tabs', '/wp-includes/js/jquery/ui/jquery.ui.tabs.min.js', array('jquery-ui-core', 'jquery-ui-widget'), '1.8.20', 1 );
+       $scripts->add( 'jquery-ui-widget', '/wp-includes/js/jquery/ui/jquery.ui.widget.min.js', array('jquery'), '1.8.20', 1 );
+
+       // deprecated, not used in core, most functionality is included in jQuery 1.3
+       $scripts->add( 'jquery-form', "/wp-includes/js/jquery/jquery.form$suffix.js", array('jquery'), '2.73', 1 );
+
+       // jQuery plugins
+       $scripts->add( 'jquery-color', "/wp-includes/js/jquery/jquery.color$suffix.js", array('jquery'), '2.0-4561m', 1 );
+       $scripts->add( 'suggest', "/wp-includes/js/jquery/suggest$suffix.js", array('jquery'), '1.1-20110113', 1 );
+       $scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20m', 1 );
+       $scripts->add( 'jquery-query', "/wp-includes/js/jquery/jquery.query.js", array('jquery'), '2.1.7', 1 );
+       $scripts->add( 'jquery-serialize-object', "/wp-includes/js/jquery/jquery.serialize-object.js", array('jquery'), '0.2', 1 );
+       $scripts->add( 'jquery-hotkeys', "/wp-includes/js/jquery/jquery.hotkeys$suffix.js", array('jquery'), '0.0.2m', 1 );
+       $scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), false, 1 );
+       $scripts->add( 'jquery-touch-punch', "/wp-includes/js/jquery/jquery.ui.touch-punch.js", array('jquery-ui-widget', 'jquery-ui-mouse'), '0.2.2', 1 );
+
+       $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20111117', 1 );
+       did_action( 'init' ) && $scripts->localize( 'thickbox', 'thickboxL10n', array(
+                       'next' => __('Next >'),
+                       'prev' => __('< Prev'),
+                       'image' => __('Image'),
+                       'of' => __('of'),
+                       'close' => __('Close'),
+                       'noiframes' => __('This feature requires inline frames. You have iframes disabled or your browser does not support them.'),
+                       'loadingAnimation' => includes_url('js/thickbox/loadingAnimation.gif'),
+                       'closeImage' => includes_url('js/thickbox/tb-close.png')
+       ) );
 
-       $scripts->add( 'jquery-ui-dialog', '/wp-includes/js/jquery/ui.dialog.js', array('jquery-ui-resizable', 'jquery-ui-draggable'), '1.7.1' );
-       $scripts->add_data( 'jquery-ui-dialog', 'group', 1 );
+       $scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop$suffix.js", array('jquery'), '0.9.8-20110113');
+
+       $scripts->add( 'swfobject', "/wp-includes/js/swfobject.js", array(), '2.2-20120417');
+
+       // common bits for both uploaders
+       $max_upload_size = ( (int) ( $max_up = @ini_get('upload_max_filesize') ) < (int) ( $max_post = @ini_get('post_max_size') ) ) ? $max_up : $max_post;
+
+       if ( empty($max_upload_size) )
+               $max_upload_size = __('not configured');
+
+       // error message for both plupload and swfupload
+       $uploader_l10n = array(
+               'queue_limit_exceeded' => __('You have attempted to queue too many files.'),
+               'file_exceeds_size_limit' => __('%s exceeds the maximum upload size for this site.'),
+               'zero_byte_file' => __('This file is empty. Please try another.'),
+               'invalid_filetype' => __('This file type is not allowed. Please try another.'),
+               'not_an_image' => __('This file is not an image. Please try another.'),
+               'image_memory_exceeded' => __('Memory exceeded. Please try another smaller file.'),
+               'image_dimensions_exceeded' => __('This is larger than the maximum size. Please try another.'),
+               'default_error' => __('An error occurred in the upload. Please try again later.'),
+               'missing_upload_url' => __('There was a configuration error. Please contact the server administrator.'),
+               'upload_limit_exceeded' => __('You may only upload 1 file.'),
+               'http_error' => __('HTTP error.'),
+               'upload_failed' => __('Upload failed.'),
+               'big_upload_failed' => __('Please try uploading this file with the %1$sbrowser uploader%2$s.'),
+               'big_upload_queued' => __('%s exceeds the maximum upload size for the multi-file uploader when used in your browser.'),
+               'io_error' => __('IO error.'),
+               'security_error' => __('Security error.'),
+               'file_cancelled' => __('File canceled.'),
+               'upload_stopped' => __('Upload stopped.'),
+               'dismiss' => __('Dismiss'),
+               'crunching' => __('Crunching&hellip;'),
+               'deleted' => __('moved to the trash.'),
+               'error_uploading' => __('&#8220;%s&#8221; has failed to upload.')
+       );
+
+       $scripts->add( 'plupload', '/wp-includes/js/plupload/plupload.js', '1.5.4' );
+       $scripts->add( 'plupload-html5', '/wp-includes/js/plupload/plupload.html5.js', array('plupload'), '1.5.4' );
+       $scripts->add( 'plupload-flash', '/wp-includes/js/plupload/plupload.flash.js', array('plupload'), '1.5.4' );
+       $scripts->add( 'plupload-silverlight', '/wp-includes/js/plupload/plupload.silverlight.js', array('plupload'), '1.5.4' );
+       $scripts->add( 'plupload-html4', '/wp-includes/js/plupload/plupload.html4.js', array('plupload'), '1.5.4' );
+
+       // cannot use the plupload.full.js, as it loads browserplus init JS from Yahoo
+       $scripts->add( 'plupload-all', false, array('plupload', 'plupload-html5', 'plupload-flash', 'plupload-silverlight', 'plupload-html4'), '1.5.4' );
+
+       $scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload-all', 'jquery') );
+       did_action( 'init' ) && $scripts->localize( 'plupload-handlers', 'pluploadL10n', $uploader_l10n );
+
+       $scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array('plupload-all', 'jquery', 'json2') );
+       did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n );
+
+       // keep 'swfupload' for back-compat.
+       $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113');
+       $scripts->add( 'swfupload-swfobject', '/wp-includes/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload', 'swfobject'), '2201a');
+       $scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2201');
+       $scripts->add( 'swfupload-speed', '/wp-includes/js/swfupload/plugins/swfupload.speed.js', array('swfupload'), '2201');
 
-       $scripts->add( 'jquery-form', "/wp-includes/js/jquery/jquery.form$suffix.js", array('jquery'), '2.02m');
-       $scripts->add_data( 'jquery-form', 'group', 1 );
+       if ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) {
+               // queue all SWFUpload scripts that are used by default
+               $scripts->add( 'swfupload-all', false, array('swfupload', 'swfupload-swfobject', 'swfupload-queue'), '2201');
+       } else {
+               $scripts->add( 'swfupload-all', '/wp-includes/js/swfupload/swfupload-all.js', array(), '2201a');
+       }
 
-       $scripts->add( 'jquery-color', "/wp-includes/js/jquery/jquery.color$suffix.js", array('jquery'), '2.0-4561m');
-       $scripts->add_data( 'jquery-color', 'group', 1 );
+       $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20110524');
+       did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n );
 
-       $scripts->add( 'interface', '/wp-includes/js/jquery/interface.js', array('jquery'), '1.2' );
+       $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js" );
 
-       $scripts->add( 'suggest', "/wp-includes/js/jquery/suggest$suffix.js", array('jquery'), '1.1-20090125');
-       $scripts->add_data( 'suggest', 'group', 1 );
+       $scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2011-02-23');
 
-       $scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20m');
-       $scripts->add_data( 'schedule', 'group', 1 );
+       $scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), '0.9.8', 1 );
 
-       $scripts->add( 'jquery-hotkeys', "/wp-includes/js/jquery/jquery.hotkeys$suffix.js", array('jquery'), '0.0.2m' );
-       $scripts->add_data( 'jquery-hotkeys', 'group', 1 );
+       $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), false, 1 );
+       did_action( 'init' ) && $scripts->localize( 'password-strength-meter', 'pwsL10n', array(
+               'empty' => __('Strength indicator'),
+               'short' => __('Very weak'),
+               'bad' => __('Weak'),
+               /* translators: password strength */
+               'good' => _x('Medium', 'password strength'),
+               'strong' => __('Strong'),
+               'mismatch' => __('Mismatch')
+       ) );
 
-       $scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), '20090102' );
-       $scripts->add_data( 'jquery-table-hotkeys', 'group', 1 );
+       $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), false, 1 );
 
-       $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20090123');
-       $scripts->add_data( 'thickbox', 'group', 1 );
+       $scripts->add( 'user-suggest', "/wp-admin/js/user-suggest$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
 
-       $scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop$suffix.js", array('jquery'), '0.9.8');
+       $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", array(), false, 1 );
 
-       $scripts->add( 'swfobject', "/wp-includes/js/swfobject.js", false, '2.1');
+       $scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wpdialogs' ), false, 1 );
+       did_action( 'init' ) && $scripts->localize( 'wplink', 'wpLinkL10n', array(
+               'title' => __('Insert/edit link'),
+               'update' => __('Update'),
+               'save' => __('Add Link'),
+               'noTitle' => __('(no title)'),
+               'noMatchesFound' => __('No matches found.')
+       ) );
 
-       $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', false, '2201');
-       $scripts->add( 'swfupload-swfobject', '/wp-includes/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload', 'swfobject'), '2201');
-       $scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2201');
-       $scripts->add( 'swfupload-speed', '/wp-includes/js/swfupload/plugins/swfupload.speed.js', array('swfupload'), '2201');
+       $scripts->add( 'wpdialogs', "/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog$suffix.js", array( 'jquery-ui-dialog' ), false, 1 );
 
-       if ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) {
-               // queue all SWFUpload scripts that are used by default
-               $scripts->add( 'swfupload-all', false, array('swfupload', 'swfupload-swfobject', 'swfupload-queue'), '2201');
-       } else {
-               $scripts->add( 'swfupload-all', '/wp-includes/js/swfupload/swfupload-all.js', array(), '2201');
-       }
+       $scripts->add( 'wpdialogs-popup', "/wp-includes/js/tinymce/plugins/wpdialogs/js/popup$suffix.js", array( 'wpdialogs' ), false, 1 );
 
-       $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20090515');
-       // these error messages came from the sample swfupload js, they might need changing.
-       $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', array(
-                       'queue_limit_exceeded' => __('You have attempted to queue too many files.'),
-                       'file_exceeds_size_limit' => sprintf(__('This file is too big. Your php.ini upload_max_filesize is %s.'), @ini_get('upload_max_filesize')),
-                       'zero_byte_file' => __('This file is empty. Please try another.'),
-                       'invalid_filetype' => __('This file type is not allowed. Please try another.'),
-                       'default_error' => __('An error occurred in the upload. Please try again later.'),
-                       'missing_upload_url' => __('There was a configuration error. Please contact the server administrator.'),
-                       'upload_limit_exceeded' => __('You may only upload 1 file.'),
-                       'http_error' => __('HTTP error.'),
-                       'upload_failed' => __('Upload failed.'),
-                       'io_error' => __('IO error.'),
-                       'security_error' => __('Security error.'),
-                       'file_cancelled' => __('File cancelled.'),
-                       'upload_stopped' => __('Upload stopped.'),
-                       'dismiss' => __('Dismiss'),
-                       'crunching' => __('Crunching&hellip;'),
-                       'deleted' => __('Deleted'),
-                       'l10n_print_after' => 'try{convertEntities(swfuploadL10n);}catch(e){};'
+       $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array( 'jquery' ), false, 1 );
+       did_action( 'init' ) && $scripts->localize( 'word-count', 'wordCountL10n', array(
+               /* translators: If your word count is based on single characters (East Asian characters),
+                  enter 'characters'. Otherwise, enter 'words'. Do not translate into your own language. */
+               'type' => 'characters' == _x( 'words', 'word count: words or characters?' ) ? 'c' : 'w',
        ) );
 
-       $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", false, '20090102');
+       $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox' ), false, 1 );
+
+       $scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), 'r6', 1 );
+
+       $scripts->add( 'customize-base',     "/wp-includes/js/customize-base$suffix.js",     array( 'jquery', 'json2' ), false, 1 );
+       $scripts->add( 'customize-loader',   "/wp-includes/js/customize-loader$suffix.js",   array( 'customize-base' ), false, 1 );
+       $scripts->add( 'customize-preview',  "/wp-includes/js/customize-preview$suffix.js",  array( 'customize-base' ), false, 1 );
+       $scripts->add( 'customize-controls', "/wp-admin/js/customize-controls$suffix.js", array( 'customize-base' ), false, 1 );
+       did_action( 'init' ) && $scripts->localize( 'customize-controls', '_wpCustomizeControlsL10n', array(
+               'activate'  => __( 'Save &amp; Activate' ),
+               'save'      => __( 'Save &amp; Publish' ),
+               'saved'     => __( 'Saved' ),
+               'cancel'    => __( 'Cancel' ),
+               'close'     => __( 'Close' ),
+               'cheatin'   => __( 'Cheatin&#8217; uh?' ),
+       ) );
 
        if ( is_admin() ) {
-               $scripts->add( 'ajaxcat', "/wp-admin/js/cat$suffix.js", array( 'wp-lists' ), '20090102' );
+               $scripts->add( 'ajaxcat', "/wp-admin/js/cat$suffix.js", array( 'wp-lists' ) );
                $scripts->add_data( 'ajaxcat', 'group', 1 );
-               $scripts->localize( 'ajaxcat', 'catL10n', array(
+               did_action( 'init' ) && $scripts->localize( 'ajaxcat', 'catL10n', array(
                        'add' => esc_attr(__('Add')),
-                       'how' => __('Separate multiple categories with commas.'),
-                       'l10n_print_after' => 'try{convertEntities(catL10n);}catch(e){};'
+                       'how' => __('Separate multiple categories with commas.')
                ) );
 
-               $scripts->add( 'admin-categories', "/wp-admin/js/categories$suffix.js", array('wp-lists'), '20090207' );
-               $scripts->add_data( 'admin-categories', 'group', 1 );
-
-               $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array('wp-lists'), '20090211' );
-               $scripts->add_data( 'admin-tags', 'group', 1 );
-
-               $scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), '20090106' );
-               $scripts->add_data( 'admin-custom-fields', 'group', 1 );
-
-               $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), '20090102' );
-               $scripts->add_data( 'password-strength-meter', 'group', 1 );
-               $scripts->localize( 'password-strength-meter', 'pwsL10n', array(
-                       'empty' => __('Strength indicator'),
-                       'short' => __('Very weak'),
-                       'bad' => __('Weak'),
-                       /* translators: password strength */
-                       'good' => _x('Medium', 'password strength'),
-                       'strong' => __('Strong'),
-                       'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};'
-               ) );
+               $scripts->add( 'admin-categories', "/wp-admin/js/categories$suffix.js", array('wp-lists'), false, 1 );
 
-               $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array('jquery'), '20090514' );
-               $scripts->add_data( 'user-profile', 'group', 1 );
+               $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array('jquery', 'wp-ajax-response'), false, 1 );
+               did_action( 'init' ) && $scripts->localize( 'admin-tags', 'tagsl10n', array(
+                       'noPerm' => __('You do not have permission to do that.'),
+                       'broken' => __('An unidentified error has occurred.')
+               ));
+
+               $scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), false, 1 );
 
-               $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20090209' );
-               $scripts->add_data( 'admin-comments', 'group', 1 );
-               $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
+               $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'quicktags', 'jquery-query'), false, 1 );
+               did_action( 'init' ) && $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
                        'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
-                       'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last'])
+                       'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']),
+                       'replyApprove' => __( 'Approve and Reply' ),
+                       'reply' => __( 'Reply' )
                ) );
 
-               $scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", false, '3517m' );
-
-               $scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), '20090327' );
-               $scripts->add_data( 'postbox', 'group', 1 );
-               $scripts->localize( 'postbox', 'postboxL10n', array(
-                       'requestFile' => admin_url('admin-ajax.php')
-               ) );
+               $scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array('jquery'), false, 1 );
 
-               $scripts->add( 'slug', "/wp-admin/js/slug$suffix.js", array('jquery'), '20090207' );
-               $scripts->add_data( 'slug', 'group', 1 );
-               $scripts->localize( 'slug', 'slugL10n', array(
-                       'requestFile' => admin_url('admin-ajax.php'),
-                       'save' => __('Save'),
-                       'cancel' => __('Cancel'),
-                       'l10n_print_after' => 'try{convertEntities(slugL10n);}catch(e){};'
-               ) );
+               $scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), false, 1 );
 
-               $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox', 'slug'), '20090526' );
-               $scripts->add_data( 'post', 'group', 1 );
-               $scripts->localize( 'post', 'postL10n', array(
-                       'tagsUsed' =>  __('Tags used on this post:'),
-                       'add' => esc_attr(__('Add')),
-                       'addTag' => esc_attr(__('Add new tag')),
-                       'separate' => __('Separate tags with commas'),
+               $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox'), false, 1 );
+               did_action( 'init' ) && $scripts->localize( 'post', 'postL10n', array(
+                       'ok' => __('OK'),
                        'cancel' => __('Cancel'),
-                       'edit' => __('Edit'),
                        'publishOn' => __('Publish on:'),
                        'publishOnFuture' =>  __('Schedule for:'),
                        'publishOnPast' => __('Published on:'),
@@ -280,7 +349,7 @@ function wp_default_scripts( &$scripts ) {
                        'endcomm' => __('No more comments found.'),
                        'publish' => __('Publish'),
                        'schedule' => __('Schedule'),
-                       'update' => __('Update Post'),
+                       'update' => __('Update'),
                        'savePending' => __('Save as Pending'),
                        'saveDraft' => __('Save Draft'),
                        'private' => __('Private'),
@@ -289,105 +358,76 @@ function wp_default_scripts( &$scripts ) {
                        'password' => __('Password Protected'),
                        'privatelyPublished' => __('Privately Published'),
                        'published' => __('Published'),
-                       'l10n_print_after' => 'try{convertEntities(postL10n);}catch(e){};'
-               ) );
-
-               $scripts->add( 'page', "/wp-admin/js/page$suffix.js", array('jquery', 'slug', 'wp-lists', 'postbox'), '20090526' );
-               $scripts->add_data( 'page', 'group', 1 );
-               $scripts->localize( 'page', 'postL10n', array(
-                       'cancel' => __('Cancel'),
-                       'edit' => __('Edit'),
-                       'publishOn' => __('Publish on:'),
-                       'publishOnFuture' =>  __('Schedule for:'),
-                       'publishOnPast' => __('Published on:'),
-                       'showcomm' => __('Show more comments'),
-                       'endcomm' => __('No more comments found.'),
-                       'publish' => __('Publish'),
-                       'schedule' => __('Schedule'),
-                       'update' => __('Update Page'),
-                       'savePending' => __('Save as Pending'),
-                       'saveDraft' => __('Save Draft'),
-                       'private' => __('Private'),
-                       'public' => __('Public'),
-                       'password' => __('Password Protected'),
-                       'privatelyPublished' => __('Privately Published'),
-                       'published' => __('Published'),
-                       'l10n_print_after' => 'try{convertEntities(postL10n);}catch(e){};'
+                       'comma' => _x( ',', 'tag delimiter' ),
                ) );
 
-               $scripts->add( 'link', "/wp-admin/js/link$suffix.js", array('wp-lists', 'postbox'), '20090506' );
-               $scripts->add_data( 'link', 'group', 1 );
+               $scripts->add( 'link', "/wp-admin/js/link$suffix.js", array('wp-lists', 'postbox'), false, 1 );
 
-               $scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array('jquery'), '20090102' );
+               $scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array('jquery') );
                $scripts->add_data( 'comment', 'group', 1 );
-               $scripts->localize( 'comment', 'commentL10n', array(
-                       'cancel' => __('Cancel'),
-                       'edit' => __('Edit'),
-                       'submittedOn' => __('Submitted on:'),
-                       'l10n_print_after' => 'try{convertEntities(commentL10n);}catch(e){};'
+               did_action( 'init' ) && $scripts->localize( 'comment', 'commentL10n', array(
+                       'submittedOn' => __('Submitted on:')
                ) );
 
-               $scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ), '20090516' );
+               $scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ) );
 
-               $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox' ), '20090114' );
-               $scripts->add_data( 'media-upload', 'group', 1 );
+               $scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable' ), false, 1 );
 
-               $scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable' ), '20090601' );
-               $scripts->add_data( 'admin-widgets', 'group', 1 );
+               $scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'jquery' ), false, 1 );
 
-               $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array( 'jquery' ), '20090422' );
-               $scripts->add_data( 'word-count', 'group', 1 );
-               $scripts->localize( 'word-count', 'wordCountL10n', array(
-                       'count' => __('Word count: %d'),
-                       'l10n_print_after' => 'try{convertEntities(wordCountL10n);}catch(e){};'
-               ));
+               // @todo: Core no longer uses theme-preview.js. Remove?
+               $scripts->add( 'theme-preview', "/wp-admin/js/theme-preview$suffix.js", array( 'thickbox', 'jquery' ), false, 1 );
 
-               $scripts->add( 'wp-gears', "/wp-admin/js/wp-gears$suffix.js", false, '20090102' );
-               $scripts->localize( 'wp-gears', 'wpGearsL10n', array(
-                       'updateCompleted' => __('Update completed.'),
-                       'error' => __('Error:'),
-                       'l10n_print_after' => 'try{convertEntities(wpGearsL10n);}catch(e){};'
-               ));
-
-               $scripts->add( 'theme-preview', "/wp-admin/js/theme-preview$suffix.js", array( 'thickbox', 'jquery' ), '20090319' );
-               $scripts->add_data( 'theme-preview', 'group', 1 );
-
-               $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery-form', 'suggest' ), '20090125' );
-               $scripts->add_data( 'inline-edit-post', 'group', 1 );
-               $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
+               $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), false, 1 );
+               did_action( 'init' ) && $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
                        'error' => __('Error while saving the changes.'),
                        'ntdeltitle' => __('Remove From Bulk Edit'),
                        'notitle' => __('(no title)'),
-                       'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};'
+                       'comma' => _x( ',', 'tag delimiter' ),
                ) );
 
-               $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery-form' ), '20090211' );
-               $scripts->add_data( 'inline-edit-tax', 'group', 1 );
-               $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
-                       'error' => __('Error while saving the changes.'),
-                       'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};'
+               $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery' ), false, 1 );
+               did_action( 'init' ) && $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
+                       'error' => __('Error while saving the changes.')
                ) );
 
-               $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery' ), '20090520' );
-               $scripts->add_data( 'plugin-install', 'group', 1 );
-               $scripts->localize( 'plugin-install', 'plugininstallL10n', array(
+               $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'thickbox' ), false, 1 );
+               did_action( 'init' ) && $scripts->localize( 'plugin-install', 'plugininstallL10n', array(
                        'plugin_information' => __('Plugin Information:'),
-                       'l10n_print_after' => 'try{convertEntities(plugininstallL10n);}catch(e){};'
+                       'ays' => __('Are you sure you want to install this plugin?')
                ) );
 
                $scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
 
-               $scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), '20090201' );
-               $scripts->add_data( 'dashboard', 'group', 1 );
+               $scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), false, 1 );
 
-               $scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '20090102' );
-               $scripts->add_data( 'hoverIntent', 'group', 1 );
+               $scripts->add( 'list-revisions', "/wp-includes/js/wp-list-revisions$suffix.js" );
 
-               $scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery-ui-draggable' ), '20090415' );
-               $scripts->add_data( 'media', 'group', 1 );
+               $scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery-ui-draggable' ), false, 1 );
 
-               $scripts->add( 'codepress', '/wp-includes/js/codepress/codepress.js', false, '0.9.6' );
-               $scripts->add_data( 'codepress', 'group', 1 );
+               $scripts->add( 'image-edit', "/wp-admin/js/image-edit$suffix.js", array('jquery', 'json2', 'imgareaselect'), false, 1 );
+               did_action( 'init' ) && $scripts->localize( 'image-edit', 'imageEditL10n', array(
+                       'error' => __( 'Could not load the preview image. Please reload the page and try again.' )
+               ));
+
+               $scripts->add( 'set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array( 'jquery' ), false, 1 );
+               did_action( 'init' ) && $scripts->localize( 'set-post-thumbnail', 'setPostThumbnailL10n', array(
+                       'setThumbnail' => __( 'Use as featured image' ),
+                       'saving' => __( 'Saving...' ),
+                       'error' => __( 'Could not set that as the thumbnail image. Try a different attachment.' ),
+                       'done' => __( 'Done' )
+               ) );
+
+               // Navigation Menus
+               $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array('jquery-ui-sortable') );
+               did_action( 'init' ) && $scripts->localize( 'nav-menu', 'navMenuL10n', array(
+                       'noResultsFound' => _x('No results found.', 'search results'),
+                       'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ),
+                       'saveAlert' => __('The changes you made will be lost if you navigate away from this page.')
+               ) );
+
+               $scripts->add( 'custom-background', "/wp-admin/js/custom-background$suffix.js", array('farbtastic'), false, 1 );
+               $scripts->add( 'media-gallery', "/wp-admin/js/media-gallery$suffix.js", array('jquery'), false, 1 );
        }
 }
 
@@ -407,53 +447,51 @@ function wp_default_scripts( &$scripts ) {
  * @param object $styles
  */
 function wp_default_styles( &$styles ) {
-       // This checks to see if site_url() returns something and if it does not
-       // then it assigns $guess_url to wp_guess_url(). Strange format, but it works.
+
        if ( ! $guessurl = site_url() )
                $guessurl = wp_guess_url();
 
        $styles->base_url = $guessurl;
        $styles->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : '';
        $styles->default_version = get_bloginfo( 'version' );
-       $styles->text_direction = 'rtl' == get_bloginfo( 'text_direction' ) ? 'rtl' : 'ltr';
-       $styles->default_dirs = array('/wp-admin/');
+       $styles->text_direction = function_exists( 'is_rtl' ) && is_rtl() ? 'rtl' : 'ltr';
+       $styles->default_dirs = array('/wp-admin/', '/wp-includes/css/');
 
-       $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'farbtastic' );
+       $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
 
-       // all colors stylesheets need to have the same query strings (cache manifest compat)
-       $colors_version = '20090610';
+       $rtl_styles = array( 'wp-admin', 'ie', 'media', 'admin-bar', 'wplink', 'customize-controls' );
+       // Any rtl stylesheets that don't have a .dev version for ltr
+       $no_suffix = array( 'farbtastic' );
 
-       $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090610' );
-       $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' );
+       $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css" );
 
-       $styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20090514' );
+       $styles->add( 'ie', "/wp-admin/css/ie$suffix.css" );
        $styles->add_data( 'ie', 'conditional', 'lte IE 7' );
 
        // Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
-       $styles->add( 'colors', true, array(), $colors_version );
-       
+       $styles->add( 'colors', true, array('wp-admin') );
+
        // do not refer to these directly, the right one is queued by the above "meta" colors handle
-       $styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css', array(), $colors_version);
-       $styles->add_data( 'colors-fresh', 'rtl', true );
-       $styles->add( 'colors-classic', '/wp-admin/css/colors-classic.css', array(), $colors_version);
-       $styles->add_data( 'colors-classic', 'rtl', true );
-
-       $styles->add( 'global', '/wp-admin/css/global.css', array(), '20090514' );
-       $styles->add( 'media', '/wp-admin/css/media.css', array(), '20090516' );
-       $styles->add( 'widgets', '/wp-admin/css/widgets.css', array(), '20090603' );
-       $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20090514' );
-       $styles->add( 'install', '/wp-admin/css/install.css', array(), '20090514' );
-       $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css', array(), '20090514' );
-       $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20090514' );
-       $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' );
-       $styles->add( 'login', '/wp-admin/css/login.css', array(), '20090514' );
-       $styles->add( 'plugin-install', '/wp-admin/css/plugin-install.css', array(), '20090514' );
-       $styles->add( 'theme-install', '/wp-admin/css/theme-install.css', array(), '20090610' );
-       $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.2' );
-       $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' );
+       $styles->add( 'colors-fresh', "/wp-admin/css/colors-fresh$suffix.css", array('wp-admin') );
+       $styles->add( 'colors-classic', "/wp-admin/css/colors-classic$suffix.css", array('wp-admin') );
 
-       foreach ( $rtl_styles as $rtl_style )
+       $styles->add( 'media', "/wp-admin/css/media$suffix.css" );
+       $styles->add( 'install', "/wp-admin/css/install$suffix.css" );
+       $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css' );
+       $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' );
+       $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' );
+       $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8' );
+       $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css" );
+       $styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css" );
+       $styles->add( 'editor-buttons', "/wp-includes/css/editor$suffix.css" );
+       $styles->add( 'wp-pointer', "/wp-includes/css/wp-pointer$suffix.css" );
+       $styles->add( 'customize-controls', "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie' ) );
+
+       foreach ( $rtl_styles as $rtl_style ) {
                $styles->add_data( $rtl_style, 'rtl', true );
+               if ( $suffix && ! in_array( $rtl_style, $no_suffix ) )
+                       $styles->add_data( $rtl_style, 'suffix', $suffix );
+       }
 }
 
 /**
@@ -461,7 +499,7 @@ function wp_default_styles( &$styles ) {
  *
  * @since 2.3.1
  *
- * @param array $js_array JavaScript scripst array
+ * @param array $js_array JavaScript scripts array
  * @return array Reordered array, if needed.
  */
 function wp_prototype_before_jquery( $js_array ) {
@@ -482,7 +520,7 @@ function wp_prototype_before_jquery( $js_array ) {
 }
 
 /**
- * Load localized script just in time for MCE.
+ * Load localized data on print rather than initialization.
  *
  * These localizations require information that may not be loaded even by init.
  *
@@ -492,21 +530,18 @@ function wp_just_in_time_script_localization() {
 
        wp_localize_script( 'autosave', 'autosaveL10n', array(
                'autosaveInterval' => AUTOSAVE_INTERVAL,
-               'previewPageText' => __('Preview this Page'),
-               'previewPostText' => __('Preview this Post'),
-               'requestFile' => admin_url('admin-ajax.php'),
                'savingText' => __('Saving Draft&#8230;'),
-               'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'),
-               'l10n_print_after' => 'try{convertEntities(autosaveL10n);}catch(e){};'
+               'saveAlert' => __('The changes you made will be lost if you navigate away from this page.')
        ) );
+
 }
 
 /**
- * Administration Panel CSS for changing the styles.
+ * Administration Screen CSS for changing the styles.
  *
  * If installing the 'wp-admin/' directory will be replaced with './'.
  *
- * The $_wp_admin_css_colors global manages the Administration Panels CSS
+ * The $_wp_admin_css_colors global manages the Administration Screens CSS
  * stylesheet that is loaded. The option that is set is 'admin_color' and is the
  * color and key for the array. The value for the color key is an object with
  * a 'url' parameter that has the URL path to the CSS file.
@@ -519,7 +554,7 @@ function wp_just_in_time_script_localization() {
  *
  * @param string $src Source URL.
  * @param string $handle Either 'colors' or 'colors-rtl'.
- * @return string URL path to CSS stylesheet for Administration Panels.
+ * @return string URL path to CSS stylesheet for Administration Screens.
  */
 function wp_style_loader_src( $src, $handle ) {
        if ( defined('WP_INSTALLING') )
@@ -528,15 +563,22 @@ function wp_style_loader_src( $src, $handle ) {
        if ( 'colors' == $handle || 'colors-rtl' == $handle ) {
                global $_wp_admin_css_colors;
                $color = get_user_option('admin_color');
+
                if ( empty($color) || !isset($_wp_admin_css_colors[$color]) )
                        $color = 'fresh';
+
                $color = $_wp_admin_css_colors[$color];
                $parsed = parse_url( $src );
                $url = $color->url;
+
+               if ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG )
+                       $url = preg_replace('/.css$|.css(?=\?)/', '.dev.css', $url);
+
                if ( isset($parsed['query']) && $parsed['query'] ) {
                        wp_parse_str( $parsed['query'], $qv );
                        $url = add_query_arg( $qv, $url );
                }
+
                return $url;
        }
 
@@ -573,16 +615,13 @@ function print_head_scripts() {
 }
 
 /**
- * Prints the scripts that were queued for the footer on admin pages.
+ * Prints the scripts that were queued for the footer or too late for the HTML head.
  *
  * @since 2.8
  */
 function print_footer_scripts() {
        global $wp_scripts, $concatenate_scripts;
 
-       if ( ! did_action('wp_print_footer_scripts') )
-               do_action('wp_print_footer_scripts');
-
        if ( !is_a($wp_scripts, 'WP_Scripts') )
                return array(); // No need to run if not instantiated.
 
@@ -597,6 +636,9 @@ function print_footer_scripts() {
        return $wp_scripts->done;
 }
 
+/**
+ * @internal use
+ */
 function _print_scripts() {
        global $wp_scripts, $compress_scripts;
 
@@ -607,15 +649,14 @@ function _print_scripts() {
        if ( !empty($wp_scripts->concat) ) {
 
                if ( !empty($wp_scripts->print_code) ) {
-                       echo "<script type='text/javascript'>\n";
-                       echo "/* <![CDATA[ */\n";
+                       echo "\n<script type='text/javascript'>\n";
+                       echo "/* <![CDATA[ */\n"; // not needed in HTML 5
                        echo $wp_scripts->print_code;
                        echo "/* ]]> */\n";
                        echo "</script>\n";
                }
 
-               $ver = md5("$wp_scripts->concat_version");
-               $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&load=" . trim($wp_scripts->concat, ', ') . "&ver=$ver";
+               $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&load=" . trim($wp_scripts->concat, ', ') . '&ver=' . $wp_scripts->default_version;
                echo "<script type='text/javascript' src='" . esc_attr($src) . "'></script>\n";
        }
 
@@ -644,12 +685,22 @@ function wp_print_head_scripts() {
 }
 
 /**
- * Prints the scripts that were queued for the footer on the front end.
+ * Private, for use in *_footer_scripts hooks
+ *
+ * @since 3.3.0
+ */
+function _wp_footer_scripts() {
+       print_late_styles();
+       print_footer_scripts();
+}
+
+/**
+ * Hooks to print the scripts and styles in the footer.
  *
  * @since 2.8
  */
 function wp_print_footer_scripts() {
-       return print_footer_scripts();
+       do_action('wp_print_footer_scripts');
 }
 
 /**
@@ -664,6 +715,11 @@ function wp_enqueue_scripts() {
        do_action('wp_enqueue_scripts');
 }
 
+/**
+ * Prints the styles queue in the HTML head on admin pages.
+ *
+ * @since 2.8
+ */
 function print_admin_styles() {
        global $wp_styles, $concatenate_scripts, $compress_css;
 
@@ -678,23 +734,66 @@ function print_admin_styles() {
 
        $wp_styles->do_items(false);
 
-       if ( apply_filters('print_admin_styles', true) ) {
-               if ( !empty($wp_styles->concat) ) {
-                       $dir = $wp_styles->text_direction;
-                       $ver = md5("$wp_styles->concat_version{$dir}");
-                       $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&load=" . trim($wp_styles->concat, ', ') . "&ver=$ver";
-                       echo "<link rel='stylesheet' href='" . esc_attr($href) . "' type='text/css' media='all' />\n";
-               }
+       if ( apply_filters('print_admin_styles', true) )
+               _print_styles();
 
-               if ( !empty($wp_styles->print_html) )
-                       echo $wp_styles->print_html;
-       }
+       $wp_styles->reset();
+       return $wp_styles->done;
+}
+
+/**
+ * Prints the styles that were queued too late for the HTML head.
+ *
+ * @since 3.3.0
+ */
+function print_late_styles() {
+       global $wp_styles, $concatenate_scripts;
 
-       $wp_styles->do_concat = false;
-       $wp_styles->concat = $wp_styles->concat_version = $wp_styles->print_html = '';
+       if ( !is_a($wp_styles, 'WP_Styles') )
+               return;
+
+       $wp_styles->do_concat = $concatenate_scripts;
+       $wp_styles->do_footer_items();
+
+       if ( apply_filters('print_late_styles', true) )
+               _print_styles();
+
+       $wp_styles->reset();
        return $wp_styles->done;
 }
 
+/**
+ * @internal use
+ */
+function _print_styles() {
+       global $wp_styles, $compress_css;
+
+       $zip = $compress_css ? 1 : 0;
+       if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP )
+               $zip = 'gzip';
+
+       if ( !empty($wp_styles->concat) ) {
+               $dir = $wp_styles->text_direction;
+               $ver = $wp_styles->default_version;
+               $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&load=" . trim($wp_styles->concat, ', ') . '&ver=' . $ver;
+               echo "<link rel='stylesheet' href='" . esc_attr($href) . "' type='text/css' media='all' />\n";
+
+               if ( !empty($wp_styles->print_code) ) {
+                       echo "<style type='text/css'>\n";
+                       echo $wp_styles->print_code;
+                       echo "\n</style>\n";
+               }
+       }
+
+       if ( !empty($wp_styles->print_html) )
+               echo $wp_styles->print_html;
+}
+
+/**
+ * Determine the concatenation and compression settings for scripts and styles.
+ *
+ * @since 2.8
+ */
 function script_concat_settings() {
        global $concatenate_scripts, $compress_scripts, $compress_css;