Index: wp-admin/load-styles.php =================================================================== --- wp-admin/load-styles.php (revision 18461) +++ wp-admin/load-styles.php (working copy) @@ -125,7 +125,10 @@ $content .= get_file($rtl_path) . "\n"; } - $out .= str_replace( '../images/', 'images/', $content ); + if ( strpos( $style->src, '/wp-includes/css/' ) === 0 ) + $out .= str_replace( '../images/', '../wp-includes/images/', $content ); + else + $out .= str_replace( '../images/', 'images/', $content ); } header('Content-Type: text/css'); Index: wp-includes/class.wp-scripts.php =================================================================== --- wp-includes/class.wp-scripts.php (revision 18461) +++ wp-includes/class.wp-scripts.php (working copy) @@ -47,35 +47,41 @@ return $this->do_items( $handles, $group ); } + // Deprecated, see print_added_js() function print_scripts_l10n( $handle, $echo = true ) { - if ( empty($this->registered[$handle]->extra['l10n']) || empty($this->registered[$handle]->extra['l10n'][0]) || !is_array($this->registered[$handle]->extra['l10n'][1]) ) + return $this->print_added_js( $handle, $echo, true ); + } + + function print_added_js( $handle, $echo = true, $_l10n = false ) { + if ( empty($this->registered[$handle]->extra['data']) ) return false; - $object_name = $this->registered[$handle]->extra['l10n'][0]; + if ( $_l10n ) { + $name = $this->registered[$handle]->extra['l10n'][0]; + $data = $this->registered[$handle]->extra['l10n'][1]; + $after = ''; - $data = "var $object_name = {\n"; - $eol = ''; - foreach ( $this->registered[$handle]->extra['l10n'][1] as $var => $val ) { - if ( 'l10n_print_after' == $var ) { - $after = $val; - continue; + if ( is_array($data) && isset($data['l10n_print_after']) ) { + $after = $data['l10n_print_after']; + unset($data['l10n_print_after']); } - $data .= "$eol\t$var: \"" . esc_js( $val ) . '"'; - $eol = ",\n"; + $output = "var $name = " . json_encode($data) . "; $after\n"; + } else { + foreach ( (array) $this->registered[$handle]->extra['data'] as $name => $data ) { + $output = "var $name = " . json_encode($data) . ";\n"; + } } - $data .= "\n};\n"; - $data .= isset($after) ? "$after\n" : ''; - if ( $echo ) { - echo "\n"; - return true; - } else { - return $data; - } + if ( !$echo ) + return $output; + + echo "\n"; + + return true; } function do_item( $handle, $group = false ) { @@ -103,7 +109,7 @@ if ( $this->do_concat ) { $srce = apply_filters( 'script_loader_src', $src, $handle ); if ( $this->in_default_dir($srce) ) { - $this->print_code .= $this->print_scripts_l10n( $handle, false ); + $this->print_code .= $this->print_added_js( $handle, false ); $this->concat .= "$handle,"; $this->concat_version .= "$handle$ver"; return true; @@ -113,7 +119,7 @@ } } - $this->print_scripts_l10n( $handle ); + $this->print_added_js( $handle ); if ( !preg_match('|^https?://|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) { $src = $this->base_url . $src; } @@ -131,7 +137,7 @@ } /** - * Localizes a script + * Localizes a script (Deprecated) * * Localizes only if script has already been added * @@ -141,9 +147,30 @@ * @return bool Successful localization */ function localize( $handle, $object_name, $l10n ) { - if ( !$object_name || !$l10n ) + return $this->add_js( $handle, $object_name, $l10n ); + } + + /** + * Add extra Javascript + * + * Only if script has already been added. Produces a Javascript object: + * $name = { + * name: value + * } + * + * @param string $handle Script name + * @param string $name Name of JS object to hold the data + * @param array $data Associative array of JS name => value + * @return bool Successful or not + */ + function add_js( $handle, $name, $data ) { + if ( !$name || !is_array($data) ) return false; - return $this->add_data( $handle, 'l10n', array( $object_name, $l10n ) ); + + if ( !empty( $this->registered[$handle]->extra['data'][$name] ) ) + $data = array_merge( $data, (array) $this->registered[$handle]->extra['data'][$name] ); + + return $this->add_data( $handle, 'data', array( $name => $data ) ); } function set_group( $handle, $recursion, $group = false ) { Index: wp-includes/functions.wp-scripts.php =================================================================== --- wp-includes/functions.wp-scripts.php (revision 18461) +++ wp-includes/functions.wp-scripts.php (working copy) @@ -56,7 +56,7 @@ } /** - * Localizes a script. + * Localizes a script. (Deprecated) * * Localizes only if script has already been added. * @@ -64,11 +64,23 @@ * @see WP_Scripts::localize() */ function wp_localize_script( $handle, $object_name, $l10n ) { + return wp_add_js( $handle, $object_name, $l10n ); +} + +/** + * Adds extra Javascript. + * + * Only if the script has already been added. + * + * @since + * @see WP_Scripts::add_js() + */ +function wp_add_js( $handle, $name, $data ) { global $wp_scripts; if ( !is_a($wp_scripts, 'WP_Scripts') ) return false; - return $wp_scripts->localize( $handle, $object_name, $l10n ); + return $wp_scripts->add_js( $handle, $name, $data ); } /** Index: wp-includes/js/l10n.dev.js =================================================================== --- wp-includes/js/l10n.dev.js (revision 18461) +++ wp-includes/js/l10n.dev.js (working copy) @@ -1,23 +0,0 @@ -//Used to ensure that Entities used in L10N strings are correct -function convertEntities(o) { - var c, v; - c = function(s) { - if (/&[^;]+;/.test(s)) { - var e = document.createElement("div"); - e.innerHTML = s; - return !e.firstChild ? s : e.firstChild.nodeValue; - } - return s; - } - - if ( typeof o === 'string' ) { - return c(o); - } else if ( typeof o === 'object' ) { - for (v in o) { - if ( typeof o[v] === 'string' ) { - o[v] = c(o[v]); - } - } - } - return o; -} \ No newline at end of file Index: wp-includes/js/l10n.js =================================================================== --- wp-includes/js/l10n.js (revision 18461) +++ wp-includes/js/l10n.js (working copy) @@ -1 +0,0 @@ -function convertEntities(b){var d,a;d=function(c){if(/&[^;]+;/.test(c)){var f=document.createElement("div");f.innerHTML=c;return !f.firstChild?c:f.firstChild.nodeValue}return c};if(typeof b==="string"){return d(b)}else{if(typeof b==="object"){for(a in b){if(typeof b[a]==="string"){b[a]=d(b[a])}}}}return b}; \ No newline at end of file Index: wp-includes/script-loader.php =================================================================== --- wp-includes/script-loader.php (revision 18461) +++ wp-includes/script-loader.php (working copy) @@ -58,17 +58,12 @@ $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : ''; - // Always ensure that we have the convertEntities function - $scripts->add( 'l10n', "/wp-includes/js/l10n$suffix.js", false, '20101110' ); - $scripts->enqueue( 'l10n' ); - $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20101110' ); $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20110711' ); $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_js( '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' ); @@ -76,7 +71,7 @@ $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", false, '20110502' ); $scripts->add_data( 'quicktags', 'group', 1 ); - $scripts->localize( 'quicktags', 'quicktagsL10n', array( + $scripts->add_js( 'quicktags', 'quicktagsL10n', array( 'quickLinks' => __('(Quick Links)'), 'wordLookup' => __('Enter a word to look up:'), 'dictionaryLookup' => esc_attr(__('Dictionary lookup')), @@ -87,8 +82,7 @@ 'enterImageURL' => __('Enter the URL of the image'), 'enterImageDescription' => __('Enter a description of the image'), 'fullscreen' => __('fullscreen'), - 'toggleFullscreen' => esc_attr( __('Toggle fullscreen mode') ), - 'l10n_print_after' => 'try{convertEntities(quicktagsL10n);}catch(e){};' + 'toggleFullscreen' => esc_attr( __('Toggle fullscreen mode') ) ) ); $scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' ); @@ -103,10 +97,9 @@ $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( + $scripts->add_js( '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'), '20110524' ); @@ -192,7 +185,7 @@ $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20110528'); $scripts->add_data( 'thickbox', 'group', 1 ); - $scripts->localize( 'thickbox', 'thickboxL10n', array( + $scripts->add_js( 'thickbox', 'thickboxL10n', array( 'next' => __('Next >'), 'prev' => __('< Prev'), 'image' => __('Image'), @@ -200,8 +193,7 @@ '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'), - 'l10n_print_after' => 'try{convertEntities(thickboxL10n);}catch(e){};' + 'closeImage' => includes_url('js/thickbox/tb-close.png') ) ); $scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop$suffix.js", array('jquery'), '0.9.8-20110113'); @@ -225,7 +217,7 @@ 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( + $scripts->add_js( 'swfupload-handlers', 'swfuploadL10n', array( 'queue_limit_exceeded' => __('You have attempted to queue too many files.'), 'file_exceeds_size_limit' => __('This file exceeds the maximum upload size for this site.'), 'zero_byte_file' => __('This file is empty. Please try another.'), @@ -242,8 +234,7 @@ 'dismiss' => __('Dismiss'), 'crunching' => __('Crunching…'), 'deleted' => __('moved to the trash.'), - 'error_uploading' => __('“%s” has failed to upload due to an error'), - 'l10n_print_after' => 'try{convertEntities(swfuploadL10n);}catch(e){};', + 'error_uploading' => __('“%s” has failed to upload due to an error') ) ); $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", false, '20090102'); @@ -255,15 +246,14 @@ $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), '20101027' ); $scripts->add_data( 'password-strength-meter', 'group', 1 ); - $scripts->localize( 'password-strength-meter', 'pwsL10n', array( + $scripts->add_js( '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'), - 'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};' + 'mismatch' => __('Mismatch') ) ); $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20110628' ); @@ -274,13 +264,12 @@ $scripts->add( 'wplink', "/wp-includes/js/tinymce/plugins/wplink/js/wplink$suffix.js", array( 'jquery', 'wpdialogs' ), '20110528' ); $scripts->add_data( 'wplink', 'group', 1 ); - $scripts->localize( 'wplink', 'wpLinkL10n', array( + $scripts->add_js( 'wplink', 'wpLinkL10n', array( 'title' => __('Insert/edit link'), 'update' => __('Update'), 'save' => __('Add Link'), 'noTitle' => __('(no title)'), - 'noMatchesFound' => __('No matches found.'), - 'l10n_print_after' => 'try{convertEntities(wpLinkL10n);}catch(e){};', + 'noMatchesFound' => __('No matches found.') ) ); $scripts->add( 'wpdialogs', "/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog$suffix.js", array( 'jquery-ui-dialog' ), '20110528' ); @@ -292,10 +281,9 @@ if ( is_admin() ) { $scripts->add( 'ajaxcat', "/wp-admin/js/cat$suffix.js", array( 'wp-lists' ), '20090102' ); $scripts->add_data( 'ajaxcat', 'group', 1 ); - $scripts->localize( 'ajaxcat', 'catL10n', array( + $scripts->add_js( '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'), '20091201' ); @@ -303,10 +291,9 @@ $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array('jquery', 'wp-ajax-response'), '20110429' ); $scripts->add_data( 'admin-tags', 'group', 1 ); - $scripts->localize( 'admin-tags', 'tagsl10n', array( + $scripts->add_js( '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){};' + 'broken' => __('An unidentified error has occurred.') )); $scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), '20110429' ); @@ -314,7 +301,7 @@ $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'jquery-query'), '20110602' ); $scripts->add_data( 'admin-comments', 'group', 1 ); - $scripts->localize( 'admin-comments', 'adminCommentsL10n', array( + $scripts->add_js( 'admin-comments', 'adminCommentsL10n', array( 'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']), 'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']), 'replyApprove' => __( 'Approve and Reply' ), @@ -329,7 +316,7 @@ $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox'), '20110524' ); $scripts->add_data( 'post', 'group', 1 ); - $scripts->localize( 'post', 'postL10n', array( + $scripts->add_js( 'post', 'postL10n', array( 'tagsUsed' => __('Tags used on this post:'), 'add' => esc_attr(__('Add')), 'addTag' => esc_attr(__('Add new Tag')), @@ -352,8 +339,7 @@ 'publicSticky' => __('Public, Sticky'), 'password' => __('Password Protected'), 'privatelyPublished' => __('Privately Published'), - 'published' => __('Published'), - 'l10n_print_after' => 'try{convertEntities(postL10n);}catch(e){};' + 'published' => __('Published') ) ); $scripts->add( 'link', "/wp-admin/js/link$suffix.js", array('wp-lists', 'postbox'), '20110524' ); @@ -361,11 +347,10 @@ $scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array('jquery'), '20110429' ); $scripts->add_data( 'comment', 'group', 1 ); - $scripts->localize( 'comment', 'commentL10n', array( + $scripts->add_js( 'comment', 'commentL10n', array( 'cancel' => __('Cancel'), 'edit' => __('Edit'), - 'submittedOn' => __('Submitted on:'), - 'l10n_print_after' => 'try{convertEntities(commentL10n);}catch(e){};' + 'submittedOn' => __('Submitted on:') ) ); $scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ), '20110414' ); @@ -387,26 +372,23 @@ $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), '20110609' ); $scripts->add_data( 'inline-edit-post', 'group', 1 ); - $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array( + $scripts->add_js( '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){};' + 'notitle' => __('(no title)') ) ); $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery' ), '20110609' ); $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_js( 'inline-edit-tax', 'inlineEditL10n', array( + 'error' => __('Error while saving the changes.') ) ); $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'thickbox' ), '20110113' ); $scripts->add_data( 'plugin-install', 'group', 1 ); - $scripts->localize( 'plugin-install', 'plugininstallL10n', array( + $scripts->add_js( 'plugin-install', 'plugininstallL10n', array( 'plugin_information' => __('Plugin Information:'), - 'ays' => __('Are you sure you want to install this plugin?'), - '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' ); @@ -427,21 +409,19 @@ $scripts->add( 'set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array( 'jquery' ), '20100518' ); $scripts->add_data( 'set-post-thumbnail', 'group', 1 ); - $scripts->localize( 'set-post-thumbnail', 'setPostThumbnailL10n', array( + $scripts->add_js( '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' ), - 'l10n_print_after' => 'try{convertEntities(setPostThumbnailL10n);}catch(e){};' + 'done' => __( 'Done' ) ) ); // Navigation Menus $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array('jquery-ui-sortable'), '20110524' ); - $scripts->localize( 'nav-menu', 'navMenuL10n', array( + $scripts->add_js( '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.'), - 'l10n_print_after' => 'try{convertEntities(navMenuL10n);}catch(e){};' + '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'), '20110511' ); @@ -474,7 +454,7 @@ $styles->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : ''; $styles->default_version = get_bloginfo( 'version' ); $styles->text_direction = function_exists( 'is_rtl' ) && is_rtl() ? 'rtl' : 'ltr'; - $styles->default_dirs = array('/wp-admin/', '/wp-includes/'); + $styles->default_dirs = array('/wp-admin/', '/wp-includes/css/'); $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : ''; @@ -558,11 +538,10 @@ */ function wp_just_in_time_script_localization() { - wp_localize_script( 'autosave', 'autosaveL10n', array( + wp_add_js( 'autosave', 'autosaveL10n', array( 'autosaveInterval' => AUTOSAVE_INTERVAL, '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){};' + 'saveAlert' => __('The changes you made will be lost if you navigate away from this page.') ) ); } @@ -635,7 +614,6 @@ $wp_scripts = new WP_Scripts(); script_concat_settings(); - $wp_scripts->do_items( 'l10n' ); $wp_scripts->do_concat = $concatenate_scripts; $wp_scripts->do_head_items();