Changeset 20295 for trunk/wp-includes/customize-controls.php

Timestamp:

03/28/2012 04:14:09 AM (13 years ago)

Author:

koopersmith

Message:

Create WP_Customize_Control to separate the process of rendering a control from fetching, previewing, and saving its values. see #19910.

Many-to-many mapping between settings and controls.

• Settings and controls have been separated in both the PHP (WP_Customize_Setting, WP_Customize_Control) and the JS (wp.customize.Setting, wp.customize.Control).
• While most settings are tied to a single control, some require multiple controls. The 'header_textcolor' control is a good example: to hide the header text, header_textcolor is set to 'blank'.

Add 'Display Header Text' control.

A handful of miscellaneous bugfixes along the way.

Notes:

• Controls should be separated out a bit more; juggling type-specific arguments in the switch statement is rather inelegant.
• Page dropdowns are currently inactive and need to be re-linked.

File:

• trunk/wp-includes/customize-controls.php (modified) (2 diffs)

trunk/wp-includes/customize-controls.php

@@ -96 +96 @@
     $settings = array(
         'preview'  => esc_url( home_url( '/', $scheme ) ),
+        'settings' => array(),
         'controls' => array(),
         'prefix'   => WP_Customize_Setting::name_prefix,
@@ -101 +102 @@
 
     foreach ( $this->settings as $id => $setting ) {
-        $settings['controls'][ $id ] = array(
+        $settings['settings'][ $id ] = array(
             'value'   => $setting->value(),
-            'control' => $setting->control,
-            'params'  => $setting->control_params,
         );
+    }
 
-        if ( $setting->visibility ) {
-            if ( is_string( $setting->visibility ) ) {
+    foreach ( $this->controls as $id => $control ) {
+        $settings['controls'][ $id ] = $control->json();
+
+        if ( $control->visibility ) {
+            if ( is_string( $control->visibility ) ) {
                 $settings['controls'][ $id ]['visibility'] = array(
-                    'id'    => $setting->visibility,
+                    'id'    => $control->visibility,
                     'value' => true,
                 );
             } else {
                 $settings['controls'][ $id ]['visibility'] = array(
-                    'id'    => $setting->visibility[0],
-                    'value' => $setting->visibility[1],
+                    'id'    => $control->visibility[0],
+                    'value' => $control->visibility[1],
                 );
             }