Removes script queue check for 'customize-loader' from wp_customize_support_script(), because we may want to check for customize-support on a page without the loader. git-svn-id: https://develop.svn.wordpress.org/trunk@20918 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
c4822affc0
commit
e0fc4ce778
|
@ -99,7 +99,12 @@ $admin_body_class .= ' no-customize-support';
|
||||||
document.body.className = document.body.className.replace('no-js','js');
|
document.body.className = document.body.className.replace('no-js','js');
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<?php wp_customize_support_script(); ?>
|
<?php
|
||||||
|
// If the customize-loader script is enqueued, make sure the customize
|
||||||
|
// body classes are correct as early as possible.
|
||||||
|
if ( wp_script_is( 'customize-loader', 'queue' ) )
|
||||||
|
wp_customize_support_script();
|
||||||
|
?>
|
||||||
|
|
||||||
<div id="wpwrap">
|
<div id="wpwrap">
|
||||||
<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
|
<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
|
||||||
|
|
|
@ -576,7 +576,16 @@ function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
|
||||||
if ( ! current_user_can( 'edit_theme_options' ) )
|
if ( ! current_user_can( 'edit_theme_options' ) )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'customize', 'title' => __('Customize'), 'href' => wp_customize_url(get_stylesheet()) ) );
|
$wp_admin_bar->add_menu( array(
|
||||||
|
'parent' => 'appearance',
|
||||||
|
'id' => 'customize',
|
||||||
|
'title' => __('Customize'),
|
||||||
|
'href' => wp_customize_url(get_stylesheet()),
|
||||||
|
'meta' => array(
|
||||||
|
'class' => 'hide-if-no-customize',
|
||||||
|
),
|
||||||
|
) );
|
||||||
|
add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
|
||||||
|
|
||||||
if ( current_theme_supports( 'widgets' ) )
|
if ( current_theme_supports( 'widgets' ) )
|
||||||
$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'widgets', 'title' => __('Widgets'), 'href' => admin_url('widgets.php') ) );
|
$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'widgets', 'title' => __('Widgets'), 'href' => admin_url('widgets.php') ) );
|
||||||
|
|
|
@ -581,6 +581,14 @@
|
||||||
background-position: -2px -203px;
|
background-position: -2px -203px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Customize support classes
|
||||||
|
*/
|
||||||
|
.no-customize-support .hide-if-no-customize,
|
||||||
|
.customize-support .hide-if-customize {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retina display 2x icons
|
* Retina display 2x icons
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1636,9 +1636,6 @@ function wp_customize_url( $stylesheet ) {
|
||||||
* @since 3.4.0
|
* @since 3.4.0
|
||||||
*/
|
*/
|
||||||
function wp_customize_support_script() {
|
function wp_customize_support_script() {
|
||||||
if ( ! wp_script_is( 'customize-loader', 'queue' ) )
|
|
||||||
return;
|
|
||||||
|
|
||||||
$admin_origin = parse_url( admin_url() );
|
$admin_origin = parse_url( admin_url() );
|
||||||
$home_origin = parse_url( home_url() );
|
$home_origin = parse_url( home_url() );
|
||||||
$cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) );
|
$cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) );
|
||||||
|
|
Loading…
Reference in New Issue