X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..1c09677af04c9e37714e09b73eb9dbc5b2e3eb13:/wp-includes/script-loader.php?ds=sidebyside
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 32b1bd29..863bf457 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -7,6 +7,18 @@
* plugins will only be concerned about the filters and actions set in this
* 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('STYLE_DEBUG', true); loads the development (non-minified) versions of all 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).
+ *
+ * The globals $concatenate_scripts, $compress_scripts and $compress_css can be set by plugins
+ * to temporarily override the above settings. Also a compression test is run once and the result is saved
+ * as option 'can_compress_scripts' (0/1). The test will run again if that option is deleted.
+ *
* @package WordPress
*/
@@ -29,60 +41,69 @@ require( ABSPATH . WPINC . '/functions.wp-styles.php' );
* Setup WordPress scripts to load by default for Administration Panels.
*
* Localizes a few of the scripts.
+ * $scripts->add_data( 'script-handle', 'group', 1 ); queues the script for the footer
*
* @since 2.6.0
*
* @param object $scripts WP_Scripts object.
*/
function wp_default_scripts( &$scripts ) {
- if (!$guessurl = site_url())
+
+ if ( !$guessurl = site_url() )
$guessurl = wp_guess_url();
$scripts->base_url = $guessurl;
+ $scripts->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : '';
$scripts->default_version = get_bloginfo( 'version' );
+ $scripts->default_dirs = array('/wp-admin/js/', '/wp-includes/js/');
+
+ $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
+
+ $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20090102' );
- $scripts->add( 'common', '/wp-admin/js/common.js', array('jquery', 'hoverIntent'), '20081210' );
- $scripts->add( 'sack', '/wp-includes/js/tw-sack.js', false, '1.6.1' );
+ $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20091212' );
+ $scripts->add_data( 'common', 'group', 1 );
+ $scripts->localize( 'common', 'commonL10n', array(
+ 'warnDelete' => __("You are about to permanently delete the selected items.\n 'Cancel' to stop, 'OK' to delete."),
+ 'l10n_print_after' => 'try{convertEntities(commonL10n);}catch(e){};'
+ ) );
+
+ $scripts->add( 'sack', "/wp-includes/js/tw-sack$suffix.js", false, '1.6.1' );
+ $scripts->add_data( 'sack', 'group', 1 );
- $scripts->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '20081210' );
+ $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", false, '20090307' );
$scripts->localize( 'quicktags', 'quicktagsL10n', array(
'quickLinks' => __('(Quick Links)'),
'wordLookup' => __('Enter a word to look up:'),
- 'dictionaryLookup' => attribute_escape(__('Dictionary lookup')),
- 'lookup' => attribute_escape(__('lookup')),
- 'closeAllOpenTags' => attribute_escape(__('Close all open tags')),
- 'closeTags' => attribute_escape(__('close tags')),
+ 'dictionaryLookup' => esc_attr(__('Dictionary lookup')),
+ 'lookup' => esc_attr(__('lookup')),
+ 'closeAllOpenTags' => esc_attr(__('Close all open tags')),
+ 'closeTags' => esc_attr(__('close tags')),
'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){};'
) );
- $scripts->add( 'colorpicker', '/wp-includes/js/colorpicker.js', array('prototype'), '3517' );
+ $scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' );
- // Modify this version when tinyMCE plugins are changed.
- function mce_version() {
- return '20081129';
- }
- add_filter( 'tiny_mce_version', 'mce_version' );
-
- $scripts->add( 'editor', '/wp-admin/js/editor.js', false, mce_version() );
+ $scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", false, '20091124' );
$scripts->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6');
- $scripts->add( 'wp-ajax-response', '/wp-includes/js/wp-ajax-response.js', array('jquery'), '20081210' );
+ $scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array('jquery'), '20091119' );
+ $scripts->add_data( 'wp-ajax-response', 'group', 1 );
$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){};'
) );
- $scripts->add( 'autosave', '/wp-includes/js/autosave.js', array('schedule', 'wp-ajax-response'), '20081210' );
+ $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), '20091012' );
+ $scripts->add_data( 'autosave', 'group', 1 );
- $scripts->add( 'wp-lists', '/wp-includes/js/wp-lists.js', array('wp-ajax-response'), '20081210' );
- $scripts->localize( 'wp-lists', 'wpListL10n', array(
- 'url' => admin_url('admin-ajax.php')
- ) );
+ $scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array('wp-ajax-response'), '20091128' );
+ $scripts->add_data( 'wp-lists', 'group', 1 );
$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');
@@ -93,29 +114,93 @@ function wp_default_scripts( &$scripts ) {
$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');
+ // not used in core, replaced by Jcrop.js
$scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop'), '20070118');
- $scripts->add( 'jquery', '/wp-includes/js/jquery/jquery.js', false, '1.2.6');
- $scripts->add( 'jquery-form', '/wp-includes/js/jquery/jquery.form.js', array('jquery'), '2.02');
- $scripts->add( 'jquery-color', '/wp-includes/js/jquery/jquery.color.js', array('jquery'), '2.0-4561');
+ $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( '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 );
+
+ // 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.02m');
+ $scripts->add_data( 'jquery-form', 'group', 1 );
+
+ $scripts->add( 'jquery-color', "/wp-includes/js/jquery/jquery.color$suffix.js", array('jquery'), '2.0-4561m');
+ $scripts->add_data( 'jquery-color', 'group', 1 );
+
+ // deprecated, not used in core
$scripts->add( 'interface', '/wp-includes/js/jquery/interface.js', array('jquery'), '1.2' );
- $scripts->add( 'suggest', '/wp-includes/js/jquery/suggest.js', array('jquery'), '1.1b');
- $scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20');
- $scripts->add( 'jquery-hotkeys', '/wp-includes/js/jquery/jquery.hotkeys.js', array('jquery'), '0.0.2' );
- $scripts->add( 'jquery-table-hotkeys', '/wp-includes/js/jquery/jquery.table-hotkeys.js', array('jquery', 'jquery-hotkeys'), '20081128' );
- $scripts->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.js', array('jquery'), '3.1-20090123');
- $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', false, '2.2.0-20081031');
- $scripts->add( 'swfupload-degrade', '/wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js', array('swfupload'), '2.2.0-20081031');
- $scripts->add( 'swfupload-swfobject', '/wp-includes/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload'), '2.2.0-20081031');
- $scripts->localize( 'swfupload-degrade', 'uploadDegradeOptions', array(
- 'is_lighttpd_before_150' => is_lighttpd_before_150(),
+
+ $scripts->add( 'suggest', "/wp-includes/js/jquery/suggest$suffix.js", array('jquery'), '1.1-20090125');
+ $scripts->add_data( 'suggest', 'group', 1 );
+
+ $scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20m');
+ $scripts->add_data( 'schedule', 'group', 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( '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( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20091124');
+ $scripts->add_data( 'thickbox', 'group', 1 );
+ $scripts->localize( 'thickbox', 'thickboxL10n', array(
+ 'next' => __('Next >'),
+ 'prev' => __('< Prev'),
+ 'image' => __('Image'),
+ 'of' => __('of'),
+ 'close' => __('Close'),
+ 'l10n_print_after' => 'try{convertEntities(thickboxL10n);}catch(e){};'
) );
- $scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2.2.0-20081031');
- $scripts->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.2.0-20081201');
+
+
+ $scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop$suffix.js", array('jquery'), '0.9.8');
+
+ $scripts->add( 'swfobject', "/wp-includes/js/swfobject.js", false, '2.1');
+
+ $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');
+
+ 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( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20091208');
+ $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');
// 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')),
+ 'file_exceeds_size_limit' => sprintf( __('This file is too big. The maximum upload size for your server is %s.'), $max_upload_size ),
'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.'),
@@ -129,62 +214,75 @@ function wp_default_scripts( &$scripts ) {
'upload_stopped' => __('Upload stopped.'),
'dismiss' => __('Dismiss'),
'crunching' => __('Crunching…'),
- 'deleted' => __('Deleted'),
+ 'deleted' => __('moved to the trash.'),
'l10n_print_after' => 'try{convertEntities(swfuploadL10n);}catch(e){};'
) );
- $scripts->add( 'jquery-ui-core', '/wp-includes/js/jquery/ui.core.js', array('jquery'), '1.5.2' );
- $scripts->add( 'jquery-ui-tabs', '/wp-includes/js/jquery/ui.tabs.js', array('jquery-ui-core'), '1.5.2' );
- $scripts->add( 'jquery-ui-sortable', '/wp-includes/js/jquery/ui.sortable.js', array('jquery-ui-core'), '1.5.2c' );
- $scripts->add( 'jquery-ui-draggable', '/wp-includes/js/jquery/ui.draggable.js', array('jquery-ui-core'), '1.5.2' );
- $scripts->add( 'jquery-ui-resizable', '/wp-includes/js/jquery/ui.resizable.js', array('jquery-ui-core'), '1.5.2' );
- $scripts->add( 'jquery-ui-dialog', '/wp-includes/js/jquery/ui.dialog.js', array('jquery-ui-resizable', 'jquery-ui-draggable'), '1.5.2' );
+ $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", false, '20090102');
+
+ $scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", false, '20090817');
- $scripts->add( 'comment-reply', '/wp-includes/js/comment-reply.js', false, '20081210');
+ $scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), '0.9.1' );
+ $scripts->add_data( 'imgareaselect', 'group', 1 );
if ( is_admin() ) {
- $scripts->add( 'ajaxcat', '/wp-admin/js/cat.js', array( 'wp-lists' ), '20081210' );
+ $scripts->add( 'ajaxcat', "/wp-admin/js/cat$suffix.js", array( 'wp-lists' ), '20090102' );
+ $scripts->add_data( 'ajaxcat', 'group', 1 );
$scripts->localize( 'ajaxcat', 'catL10n', array(
- 'add' => attribute_escape(__('Add')),
+ 'add' => esc_attr(__('Add')),
'how' => __('Separate multiple categories with commas.'),
'l10n_print_after' => 'try{convertEntities(catL10n);}catch(e){};'
) );
- $scripts->add( 'admin-categories', '/wp-admin/js/categories.js', array('wp-lists'), '20081210' );
- $scripts->add( 'admin-tags', '/wp-admin/js/tags.js', array('wp-lists'), '20081210' );
- $scripts->add( 'admin-custom-fields', '/wp-admin/js/custom-fields.js', array('wp-lists'), '20081210' );
- $scripts->add( 'password-strength-meter', '/wp-admin/js/password-strength-meter.js', array('jquery'), '20081210' );
+
+ $scripts->add( 'admin-categories', "/wp-admin/js/categories$suffix.js", array('wp-lists'), '20091201' );
+ $scripts->add_data( 'admin-categories', 'group', 1 );
+
+ $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array('jquery'), '20090623' );
+ $scripts->add_data( 'admin-tags', 'group', 1 );
+ $scripts->localize( 'admin-tags', 'tagsl10n', array(
+ 'noPerm' => __('You do not have permission to do that.'),
+ 'broken' => __('An unidentified error has occurred.'),
+ 'l10n_print_after' => 'try{convertEntities(tagsl10n);}catch(e){};'
+ ));
+
+ $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'),
- 'good' => _c('Medium|password strength'),
+ /* translators: password strength */
+ 'good' => _x('Medium', 'password strength'),
'strong' => __('Strong'),
'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};'
) );
- $scripts->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20081210' );
+
+ $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array('jquery'), '20090514' );
+ $scripts->add_data( 'user-profile', 'group', 1 );
+
+ $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20091129' );
+ $scripts->add_data( 'admin-comments', 'group', 1 );
$scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last'])
) );
- $scripts->add( 'admin-users', '/wp-admin/js/users.js', array('wp-lists'), '20081210' );
- $scripts->add( 'xfn', '/wp-admin/js/xfn.js', false, '3517' );
- $scripts->add( 'postbox', '/wp-admin/js/postbox.js', array('jquery-ui-sortable'), '20081210' );
- $scripts->localize( 'postbox', 'postboxL10n', array(
- 'requestFile' => admin_url('admin-ajax.php')
- ) );
- $scripts->add( 'slug', '/wp-admin/js/slug.js', array('jquery'), '20081210' );
- $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( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug'), '20081210' );
+
+ $scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", false, '3517m' );
+
+ $scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), '20091012' );
+ $scripts->add_data( 'postbox', 'group', 1 );
+
+ $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox'), '20091208' );
+ $scripts->add_data( 'post', 'group', 1 );
$scripts->localize( 'post', 'postL10n', array(
'tagsUsed' => __('Tags used on this post:'),
- 'add' => attribute_escape(__('Add')),
- 'addTag' => attribute_escape(__('Add new tag')),
+ 'add' => esc_attr(__('Add')),
+ 'addTag' => esc_attr(__('Add new tag')),
'separate' => __('Separate tags with commas'),
+ 'ok' => __('OK'),
'cancel' => __('Cancel'),
'edit' => __('Edit'),
'publishOn' => __('Publish on:'),
@@ -194,7 +292,8 @@ function wp_default_scripts( &$scripts ) {
'endcomm' => __('No more comments found.'),
'publish' => __('Publish'),
'schedule' => __('Schedule'),
- 'update' => __('Update Post'),
+ 'updatePost' => __('Update Post'),
+ 'updatePage' => __('Update Page'),
'savePending' => __('Save as Pending'),
'saveDraft' => __('Save Draft'),
'private' => __('Private'),
@@ -205,64 +304,46 @@ function wp_default_scripts( &$scripts ) {
'published' => __('Published'),
'l10n_print_after' => 'try{convertEntities(postL10n);}catch(e){};'
) );
- $scripts->add( 'page', '/wp-admin/js/page.js', array('jquery', 'slug', 'wp-lists', 'postbox'), '20081210' );
- $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){};'
- ) );
- $scripts->add( 'link', '/wp-admin/js/link.js', array('jquery-ui-tabs', 'wp-lists', 'postbox'), '20081210' );
- $scripts->add( 'comment', '/wp-admin/js/comment.js', array('jquery'), '20081210' );
+
+ $scripts->add( 'link', "/wp-admin/js/link$suffix.js", array('wp-lists', 'postbox'), '20090506' );
+ $scripts->add_data( 'link', 'group', 1 );
+
+ $scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array('jquery'), '20091202' );
+ $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){};'
) );
- $scripts->add( 'admin-gallery', '/wp-admin/js/gallery.js', array( 'jquery-ui-sortable' ), '20081210' );
- $scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20081210' );
- $scripts->add( 'admin-widgets', '/wp-admin/js/widgets.js', array( 'interface' ), '20081210' );
- $scripts->localize( 'admin-widgets', 'widgetsL10n', array(
- 'add' => __('Add'),
- 'edit' => __('Edit'),
- 'cancel' => __('Cancel'),
- 'lameReminder' => __('Remember to click the "Save Changes" button at the bottom of the Current Widgets column after you\'re all done!'),
- 'lamerReminder' => __("You're about to leave without having saved your changes!"),
- 'l10n_print_after' => 'try{convertEntities(widgetsL10n);}catch(e){};'
- ));
+ $scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ), '20090516' );
- $scripts->add( 'word-count', '/wp-admin/js/word-count.js', array( 'jquery' ), '20081210' );
+ $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox' ), '20091023' );
+ $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' ), '20090824' );
+ $scripts->add_data( 'admin-widgets', 'group', 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){};'
));
- $scripts->add( 'wp-gears', '/wp-admin/js/wp-gears.js', false, '20081210' );
+ $scripts->add( 'wp-gears', "/wp-admin/js/wp-gears$suffix.js", false, '20090717' );
$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.js', array( 'thickbox', 'jquery' ), '20081210' );
+ $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.js', array( 'jquery', 'jquery-form', 'suggest' ), '20081210' );
+ $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), '20091202' );
+ $scripts->add_data( 'inline-edit-post', 'group', 1 );
$scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
'error' => __('Error while saving the changes.'),
'ntdeltitle' => __('Remove From Bulk Edit'),
@@ -270,13 +351,15 @@ function wp_default_scripts( &$scripts ) {
'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};'
) );
- $scripts->add( 'inline-edit-tax', '/wp-admin/js/inline-edit-tax.js', array( 'jquery', 'jquery-form' ), '20081210' );
+ $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery' ), '20090623' );
+ $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( 'plugin-install', '/wp-admin/js/plugin-install.js', array( 'thickbox', 'jquery' ), '20081210' );
+ $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(
'plugin_information' => __('Plugin Information:'),
'l10n_print_after' => 'try{convertEntities(plugininstallL10n);}catch(e){};'
@@ -284,9 +367,29 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
- $scripts->add( 'dashboard', '/wp-admin/js/dashboard.js', array( 'jquery', 'admin-comments', 'postbox' ), '20081210' );
+ $scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), '20090618' );
+ $scripts->add_data( 'dashboard', 'group', 1 );
+
+ $scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '20090102' );
+ $scripts->add_data( 'hoverIntent', 'group', 1 );
+
+ $scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery-ui-draggable' ), '20090415' );
+ $scripts->add_data( 'media', 'group', 1 );
+
+ $scripts->add( 'codepress', '/wp-includes/js/codepress/codepress.js', false, '0.9.6' );
+ $scripts->add_data( 'codepress', 'group', 1 );
- $scripts->add( 'hoverIntent', '/wp-includes/js/hoverIntent.js', array('jquery'), '20081210' );
+ $scripts->add( 'image-edit', "/wp-admin/js/image-edit$suffix.js", array('jquery', 'json2', 'imgareaselect'), '20091111' );
+ $scripts->add_data( 'image-edit', 'group', 1 );
+
+ $scripts->add( 'set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array( 'jquery' ), '20091210b' );
+ $scripts->add_data( 'set-post-thumbnail', 'group', 1 );
+ $scripts->localize( 'set-post-thumbnail', 'setPostThumbnailL10n', array(
+ 'setThumbnail' => __( 'Use as thumbnail' ),
+ 'saving' => __( 'Saving...' ),
+ 'error' => __( 'Could not set that as the thumbnail image. Try a different attachment.' ),
+ 'done' => __( 'Done' )
+ ) );
}
}
@@ -311,35 +414,49 @@ function wp_default_styles( &$styles ) {
// 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/');
+
+ $suffix = defined('STYLE_DEBUG') && STYLE_DEBUG ? '.dev' : '';
$rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'farbtastic' );
- $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081210' );
- $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' );
+ // all colors stylesheets need to have the same query strings (cache manifest compat)
+ $colors_version = '20091217';
- $styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20081210' );
- $styles->add_data( 'ie', 'conditional', 'gte IE 6' );
+ $styles->add( 'wp-admin', "/wp-admin/wp-admin$suffix.css", array(), '20091217' );
+ $styles->add_data( 'wp-admin', 'rtl', "/wp-admin/rtl$suffix.css" );
- $styles->add( 'colors', true, array(), '20081210' ); // Register "meta" stylesheet for admin colors
- $styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css', array(), '20081210'); // for login.php. Is there a better way?
+ $styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20091217' );
+ $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 );
+
+ // 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$suffix.css", array(), $colors_version);
$styles->add_data( 'colors-fresh', 'rtl', true );
- $styles->add( 'colors-classic', '/wp-admin/css/colors-classic.css', array(), '20081210');
+ $styles->add( 'colors-classic', "/wp-admin/css/colors-classic$suffix.css", array(), $colors_version);
$styles->add_data( 'colors-classic', 'rtl', true );
- $styles->add( 'global', '/wp-admin/css/global.css', array(), '20081210' );
- $styles->add( 'media', '/wp-admin/css/media.css', array(), '20081210' );
- $styles->add( 'widgets', '/wp-admin/css/widgets.css', array(), '20081210' );
- $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081210' );
- $styles->add( 'install', '/wp-admin/css/install.css', array(), '20081210' );
- $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css', array(), '20081210' );
- $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20081210' );
- $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20081210' );
- $styles->add( 'login', '/wp-admin/css/login.css', array(), '20081210' );
- $styles->add( 'plugin-install', '/wp-admin/css/plugin-install.css', array(), '20081210' );
+ $styles->add( 'global', "/wp-admin/css/global$suffix.css", array(), '20091217' );
+ $styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20091029' );
+ $styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css", array(), '20091118' );
+ $styles->add( 'dashboard', "/wp-admin/css/dashboard$suffix.css", array(), '20091211' );
+ $styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20090514' );
+ $styles->add( 'theme-editor', "/wp-admin/css/theme-editor$suffix.css", array(), '20090625' );
+ $styles->add( 'press-this', "/wp-admin/css/press-this$suffix.css", array(), '20091022' );
+ $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' );
+ $styles->add( 'login', "/wp-admin/css/login$suffix.css", array(), '20091010' );
+ $styles->add( 'plugin-install', "/wp-admin/css/plugin-install$suffix.css", array(), '20090514' );
+ $styles->add( 'theme-install', "/wp-admin/css/theme-install$suffix.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( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' );
foreach ( $rtl_styles as $rtl_style )
$styles->add_data( $rtl_style, 'rtl', true );
@@ -354,10 +471,10 @@ function wp_default_styles( &$styles ) {
* @return array Reordered array, if needed.
*/
function wp_prototype_before_jquery( $js_array ) {
- if ( false === $jquery = array_search( 'jquery', $js_array ) )
+ if ( false === $jquery = array_search( 'jquery', $js_array, true ) )
return $js_array;
- if ( false === $prototype = array_search( 'prototype', $js_array ) )
+ if ( false === $prototype = array_search( 'prototype', $js_array, true ) )
return $js_array;
if ( $prototype < $jquery )
@@ -378,7 +495,6 @@ function wp_prototype_before_jquery( $js_array ) {
* @since 2.5.0
*/
function wp_just_in_time_script_localization() {
- global $current_user;
wp_localize_script( 'autosave', 'autosaveL10n', array(
'autosaveInterval' => AUTOSAVE_INTERVAL,
@@ -386,15 +502,9 @@ function wp_just_in_time_script_localization() {
'previewPostText' => __('Preview this Post'),
'requestFile' => admin_url('admin-ajax.php'),
'savingText' => __('Saving Draft…'),
+ 'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'),
'l10n_print_after' => 'try{convertEntities(autosaveL10n);}catch(e){};'
) );
-
- $userid = isset($current_user) ? $current_user->ID : 0;
- wp_localize_script( 'common', 'userSettings', array(
- 'url' => SITECOOKIEPATH,
- 'uid' => $userid,
- 'time' => time()
- ) );
}
/**
@@ -424,21 +534,204 @@ 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('STYLE_DEBUG') && STYLE_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;
}
return $src;
}
+/**
+ * Prints the script queue in the HTML head on admin pages.
+ *
+ * Postpones the scripts that were queued for the footer.
+ * print_footer_scripts() is called in the footer to print these scripts.
+ *
+ * @since 2.8
+ * @see wp_print_scripts()
+ */
+function print_head_scripts() {
+ global $wp_scripts, $concatenate_scripts;
+
+ if ( ! did_action('wp_print_scripts') )
+ do_action('wp_print_scripts');
+
+ if ( !is_a($wp_scripts, 'WP_Scripts') )
+ $wp_scripts = new WP_Scripts();
+
+ script_concat_settings();
+ $wp_scripts->do_concat = $concatenate_scripts;
+ $wp_scripts->do_head_items();
+
+ if ( apply_filters('print_head_scripts', true) )
+ _print_scripts();
+
+ $wp_scripts->reset();
+ return $wp_scripts->done;
+}
+
+/**
+ * Prints the scripts that were queued for the footer on admin pages.
+ *
+ * @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.
+
+ script_concat_settings();
+ $wp_scripts->do_concat = $concatenate_scripts;
+ $wp_scripts->do_footer_items();
+
+ if ( apply_filters('print_footer_scripts', true) )
+ _print_scripts();
+
+ $wp_scripts->reset();
+ return $wp_scripts->done;
+}
+
+function _print_scripts() {
+ global $wp_scripts, $compress_scripts;
+
+ $zip = $compress_scripts ? 1 : 0;
+ if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP )
+ $zip = 'gzip';
+
+ if ( !empty($wp_scripts->concat) ) {
+
+ if ( !empty($wp_scripts->print_code) ) {
+ echo "\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";
+ echo "\n";
+ }
+
+ if ( !empty($wp_scripts->print_html) )
+ echo $wp_scripts->print_html;
+}
+
+/**
+ * Prints the script queue in the HTML head on the front end.
+ *
+ * Postpones the scripts that were queued for the footer.
+ * wp_print_footer_scripts() is called in the footer to print these scripts.
+ *
+ * @since 2.8
+ */
+function wp_print_head_scripts() {
+ if ( ! did_action('wp_print_scripts') )
+ do_action('wp_print_scripts');
+
+ global $wp_scripts;
+
+ if ( !is_a($wp_scripts, 'WP_Scripts') )
+ return array(); // no need to run if nothing is queued
+
+ return print_head_scripts();
+}
+
+/**
+ * Prints the scripts that were queued for the footer on the front end.
+ *
+ * @since 2.8
+ */
+function wp_print_footer_scripts() {
+ return print_footer_scripts();
+}
+
+/**
+ * Wrapper for do_action('wp_enqueue_scripts')
+ *
+ * Allows plugins to queue scripts for the front end using wp_enqueue_script().
+ * Runs first in wp_head() where all is_home(), is_page(), etc. functions are available.
+ *
+ * @since 2.8
+ */
+function wp_enqueue_scripts() {
+ do_action('wp_enqueue_scripts');
+}
+
+function print_admin_styles() {
+ global $wp_styles, $concatenate_scripts, $compress_css;
+
+ if ( !is_a($wp_styles, 'WP_Styles') )
+ $wp_styles = new WP_Styles();
+
+ script_concat_settings();
+ $wp_styles->do_concat = $concatenate_scripts;
+ $zip = $compress_css ? 1 : 0;
+ if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP )
+ $zip = 'gzip';
+
+ $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 "\n";
+ }
+
+ if ( !empty($wp_styles->print_html) )
+ echo $wp_styles->print_html;
+ }
+
+ $wp_styles->do_concat = false;
+ $wp_styles->concat = $wp_styles->concat_version = $wp_styles->print_html = '';
+ return $wp_styles->done;
+}
+
+function script_concat_settings() {
+ global $concatenate_scripts, $compress_scripts, $compress_css;
+
+ $compressed_output = ( ini_get('zlib.output_compression') || 'ob_gzhandler' == ini_get('output_handler') );
+
+ if ( ! isset($concatenate_scripts) ) {
+ $concatenate_scripts = defined('CONCATENATE_SCRIPTS') ? CONCATENATE_SCRIPTS : true;
+ if ( ! is_admin() || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) )
+ $concatenate_scripts = false;
+ }
+
+ if ( ! isset($compress_scripts) ) {
+ $compress_scripts = defined('COMPRESS_SCRIPTS') ? COMPRESS_SCRIPTS : true;
+ if ( $compress_scripts && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
+ $compress_scripts = false;
+ }
+
+ if ( ! isset($compress_css) ) {
+ $compress_css = defined('COMPRESS_CSS') ? COMPRESS_CSS : true;
+ if ( $compress_css && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
+ $compress_css = false;
+ }
+}
+
add_action( 'wp_default_scripts', 'wp_default_scripts' );
add_filter( 'wp_print_scripts', 'wp_just_in_time_script_localization' );
add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' );