Localize user-settings JIT to avoid warnings
git-svn-id: https://develop.svn.wordpress.org/trunk@9184 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
d5a5483e95
commit
f29e7feca4
|
@ -35,12 +35,9 @@ require( ABSPATH . WPINC . '/functions.wp-styles.php' );
|
||||||
* @param object $scripts WP_Scripts object.
|
* @param object $scripts WP_Scripts object.
|
||||||
*/
|
*/
|
||||||
function wp_default_scripts( &$scripts ) {
|
function wp_default_scripts( &$scripts ) {
|
||||||
global $current_user;
|
|
||||||
|
|
||||||
if (!$guessurl = site_url())
|
if (!$guessurl = site_url())
|
||||||
$guessurl = wp_guess_url();
|
$guessurl = wp_guess_url();
|
||||||
|
|
||||||
$userid = isset($current_user) ? $current_user->ID : 0;
|
|
||||||
$scripts->base_url = $guessurl;
|
$scripts->base_url = $guessurl;
|
||||||
$scripts->default_version = get_bloginfo( 'version' );
|
$scripts->default_version = get_bloginfo( 'version' );
|
||||||
|
|
||||||
|
@ -263,11 +260,6 @@ function wp_default_scripts( &$scripts ) {
|
||||||
$scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
|
$scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
|
||||||
|
|
||||||
$scripts->add( 'user-settings', '/wp-admin/js/user-settings.js', array(), '20080829' );
|
$scripts->add( 'user-settings', '/wp-admin/js/user-settings.js', array(), '20080829' );
|
||||||
$scripts->localize( 'user-settings', 'userSettings', array(
|
|
||||||
'url' => SITECOOKIEPATH,
|
|
||||||
'uid' => $userid,
|
|
||||||
'time' => time()
|
|
||||||
) );
|
|
||||||
|
|
||||||
$scripts->add( 'posts', '/wp-admin/js/posts.js', array('columns', 'settings-box'), '20080925' );
|
$scripts->add( 'posts', '/wp-admin/js/posts.js', array('columns', 'settings-box'), '20080925' );
|
||||||
$scripts->add( 'pages', '/wp-admin/js/pages.js', array('columns', 'settings-box'), '20080925' );
|
$scripts->add( 'pages', '/wp-admin/js/pages.js', array('columns', 'settings-box'), '20080925' );
|
||||||
|
@ -378,6 +370,8 @@ function wp_prototype_before_jquery( $js_array ) {
|
||||||
* @since 2.5.0
|
* @since 2.5.0
|
||||||
*/
|
*/
|
||||||
function wp_just_in_time_script_localization() {
|
function wp_just_in_time_script_localization() {
|
||||||
|
global $current_user;
|
||||||
|
|
||||||
wp_localize_script( 'autosave', 'autosaveL10n', array(
|
wp_localize_script( 'autosave', 'autosaveL10n', array(
|
||||||
'autosaveInterval' => AUTOSAVE_INTERVAL,
|
'autosaveInterval' => AUTOSAVE_INTERVAL,
|
||||||
'previewPageText' => __('Preview this Page'),
|
'previewPageText' => __('Preview this Page'),
|
||||||
|
@ -385,6 +379,13 @@ function wp_just_in_time_script_localization() {
|
||||||
'requestFile' => admin_url('admin-ajax.php'),
|
'requestFile' => admin_url('admin-ajax.php'),
|
||||||
'savingText' => __('Saving Draft…')
|
'savingText' => __('Saving Draft…')
|
||||||
) );
|
) );
|
||||||
|
|
||||||
|
$userid = isset($current_user) ? $current_user->ID : 0;
|
||||||
|
wp_localize_script( 'user-settings', 'userSettings', array(
|
||||||
|
'url' => SITECOOKIEPATH,
|
||||||
|
'uid' => $userid,
|
||||||
|
'time' => time()
|
||||||
|
) );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue