Changeset 20260

Timestamp:

03/22/2012 07:17:26 AM (13 years ago)

Author:

koopersmith

Message:

Theme Customizer: Add a WP_Customize_Setting->visibility parameter to show/hide a control based upon the value of another control. Also shifts rendering the setting wrapper element into WP_Customize_Setting->render() and adds WP_Customize_Setting->render_content(). see #19910.

Location:

trunk/wp-includes

Files:

• class-wp-customize-section.php (modified) (1 diff)
• class-wp-customize-setting.php (modified) (2 diffs)
• class-wp-customize.php (modified) (5 diffs)
• customize-controls.php (modified) (1 diff)
• js/customize-controls.dev.js (modified) (1 diff)

trunk/wp-includes/class-wp-customize-section.php

@@ -84 +84 @@
             <h3 class="customize-section-title" title="<?php echo esc_attr( $this->description ); ?>"><?php echo esc_html( $this->title ); ?></h3>
             <ul class="customize-section-content">
-                <?php foreach ( $this->settings as $setting ) : ?>
-                <li id="customize-control-<?php echo esc_attr( $setting->id ); ?>" class="customize-control customize-control-<?php echo esc_attr( $setting->control ); ?>">
-                    <?php $setting->maybe_render(); ?>
-                </li>
-                <?php endforeach; ?>
+                <?php
+                foreach ( $this->settings as $setting )
+                    $setting->maybe_render();
+                ?>
             </ul>
         </li>

trunk/wp-includes/class-wp-customize-setting.php

@@ -21 +21 @@
     public $default           = '';
     public $sanitize_callback = '';
+    public $visibility;
 
     protected $id_data = array();
@@ -297 +298 @@
 
     /**
-     * Render the control.
+     * Render the control. Renders the control wrapper, then calls $this->render_content().
      *
      * @since 3.4.0
      */
     protected function render() {
+
+        $id    = 'customize-control-' . $this->id;
+        $class = 'customize-control customize-control-' . $this->control;
+
+        $style = '';
+        if ( $this->visibility ) {
+            $visibility_setting = $this->manager->get_setting( $this->visibility[0] );
+            $visibility_value   = isset( $this->visibility[1] ) ? $this->visibility[1] : true;
+
+            if ( $visibility_setting && $visibility_value != $visibility_setting->value() )
+                $style = 'style="display:none;"';
+        }
+
+        ?><li id="<?php echo esc_attr( $id ); ?>" class="<?php echo esc_attr( $class ); ?>" <?php echo $style; ?>>
+            <?php $this->render_content(); ?>
+        </li><?php
+    }
+
+    /**
+     * Render the control's content.
+     *
+     * Allows the content to be overriden without having to rewrite the wrapper.
+     *
+     * @since 3.4.0
+     */
+    protected function render_content() {
         switch( $this->control ) {
             case 'text':

trunk/wp-includes/class-wp-customize.php

@@ -619 +619 @@
             'default'        => get_option( 'show_on_front' ),
             'type'           => 'option',
-            'capability'     => 'manage_options'
+            'capability'     => 'manage_options',
         ) );
 
@@ -628 +628 @@
             'control'        => 'dropdown-pages',
             'type'           => 'option',
-            'capability'     => 'manage_options'
+            'capability'     => 'manage_options',
+            'visibility'     => array( 'show_on_front', 'page' ),
         ) );
 
@@ -637 +638 @@
             'control'        => 'dropdown-pages',
             'type'           => 'option',
-            'capability'     => 'manage_options'
+            'capability'     => 'manage_options',
+            'visibility'     => array( 'show_on_front', 'page' ),
         ) );
 
@@ -651 +653 @@
             'default'        => get_option( 'blogname' ),
             'type'           => 'option',
-            'capability'     => 'manage_options'
+            'capability'     => 'manage_options',
         ) );
 
@@ -659 +661 @@
             'default'        => get_option( 'blogdescription' ),
             'type'           => 'option',
-            'capability'     => 'manage_options'
+            'capability'     => 'manage_options',
         ) );
     }

trunk/wp-includes/customize-controls.php

@@ -105 +105 @@
             'control' => $setting->control,
         );
+
+        if ( $setting->visibility ) {
+            $settings['controls'][ $id ]['visibility'] = array(
+                'id'    => $setting->visibility[0],
+                'value' => isset( $setting->visibility[1] ) ? $setting->visibility[1] : true,
+            );
+        }
     }
 

trunk/wp-includes/js/customize-controls.dev.js

@@ -231 +231 @@
 
         $.each( api.settings.controls, function( id, data ) {
-            var constructor = api.controls[ data.control ] || api.Control;
-            api.add( id, new constructor( id, data.value, {
+            var constructor = api.controls[ data.control ] || api.Control,
+                control;
+
+            control = api.add( id, new constructor( id, data.value, {
                 previewer: previewer
             } ) );
+
+            if ( data.visibility ) {
+                api( data.visibility.id, function( other ) {
+                    other.bind( function( to ) {
+                        control.container.toggle( to == data.visibility.value );
+                    });
+                });
+            }
         });