Changeset 20918

Timestamp:

05/25/2012 10:26:00 PM (12 years ago)

Author:

koopersmith

Message:

Hide 'Customize' toolbar item when customizer is not supported. fixes #20751, see #19910.

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.

Location:

trunk

Files:

• wp-admin/admin-header.php (modified) (1 diff)
• wp-includes/admin-bar.php (modified) (1 diff)
• wp-includes/css/admin-bar.dev.css (modified) (1 diff)
• wp-includes/theme.php (modified) (1 diff)

trunk/wp-admin/admin-header.php

@@ -100 +100 @@
 </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">

trunk/wp-includes/admin-bar.php

@@ -577 +577 @@
         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' )  )

trunk/wp-includes/css/admin-bar.dev.css

@@ -583 +583 @@
 
 /**
+ * Customize support classes
+ */
+.no-customize-support .hide-if-no-customize,
+.customize-support .hide-if-customize {
+    display: none;
+}
+
+/**
  * Retina display 2x icons
  */

trunk/wp-includes/theme.php

@@ -1637 +1637 @@
  */
 function wp_customize_support_script() {
-    if ( ! wp_script_is( 'customize-loader', 'queue' ) )
-        return;
-
     $admin_origin = parse_url( admin_url() );
     $home_origin  = parse_url( home_url() );