Changeset 20248 for trunk/wp-includes/class-wp-customize-setting.php

Timestamp:

03/21/2012 10:55:43 PM (14 years ago)

Author:

koopersmith

Message:

Theme Customizer: Numerous API refinements and bugfixes. Add a theme_supports check for header_textcolor. see #19910.

• prepare_controls() now removes any settings and sections that return false for check_capabilities().
• Added maybe_render() methods to both settings and sections that call the protected render() methods.
• Stop firing front-end preview functionality when rendering the controls.
• Merged the WP_Customize_Setting->_render_type() method into WP_Customize_Setting->render().
• Removed the 'customize_render_control-' hook; use 'customize_render_setting' instead.
• Added a property to sections and settings so they no longer rely on the global. Hooray for dependency injection.
• Shifted calls to WP_Customize_Setting->enqueue() to the 'customize_controls_enqueue_scripts' action.
• Added a theme_supports check for the header_textcolor setting.

File:

• trunk/wp-includes/class-wp-customize-setting.php (modified) (8 diffs)

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

@@ -9 +9 @@
 
 class WP_Customize_Setting {
+        public $manager;
         public $id;
         public $priority          = 10;
@@ -36 +37 @@
          * @param array $args Setting arguments.
          */
-        function __construct( $id, $args = array() ) {
+        function __construct( $manager, $id, $args = array() ) {
                 $keys = array_keys( get_class_vars( __CLASS__ ) );
                 foreach ( $keys as $key ) {
@@ -43 +44 @@
                 }
 
+                $this->manager = $manager;
                 $this->id = $id;
 
@@ -266 +268 @@
          */
         public final function check_capabilities() {
-                global $customize;
-
                 if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) )
                         return false;
@@ -274 +274 @@
                         return false;
 
-                $section = $customize->get_section( $this->section );
+                $section = $this->manager->get_section( $this->section );
                 if ( isset( $section ) && ! $section->check_capabilities() )
                         return false;
@@ -282 +282 @@
 
         /**
-         * Render the control.
-         *
-         * @since 3.4.0
-         */
-        public final function _render() {
+         * Check capabiliites and render the control.
+         *
+         * @since 3.4.0
+         */
+        public final function maybe_render() {
                 if ( ! $this->check_capabilities() )
                         return;
 
-                do_action( 'customize_render_' . $this->id );
+                do_action( 'customize_render_setting', $this );
+                do_action( 'customize_render_setting_' . $this->id, $this );
 
                 $this->render();
@@ -301 +302 @@
          */
         protected function render() {
-                $this->_render_type();
-        }
-
-        /**
-         * Retrieve the name attribute for an input.
-         *
-         * @since 3.4.0
-         *
-         * @return string The name.
-         */
-        public final function get_name() {
-                return self::name_prefix . esc_attr( $this->id );
-        }
-
-        /**
-         * Echo the HTML name attribute for an input.
-         *
-         * @since 3.4.0
-         *
-         * @return string The HTML name attribute.
-         */
-        public final function name() {
-                echo 'name="' . $this->get_name() . '"';
-        }
-
-        /**
-         * Render the control type.
-         *
-         * @todo Improve value and checked attributes.
-         *
-         * @since 3.4.0
-         */
-        public final function _render_type() {
                 switch( $this->control ) {
                         case 'text':
@@ -415 +383 @@
                                 <?php
                                 break;
-                        default:
-                                do_action( 'customize_render_control-' . $this->control, $this );
-
-                }
+                }
+        }
+
+        /**
+         * Retrieve the name attribute for an input.
+         *
+         * @since 3.4.0
+         *
+         * @return string The name.
+         */
+        public final function get_name() {
+                return self::name_prefix . esc_attr( $this->id );
+        }
+
+        /**
+         * Echo the HTML name attribute for an input.
+         *
+         * @since 3.4.0
+         *
+         * @return string The HTML name attribute.
+         */
+        public final function name() {
+                echo 'name="' . $this->get_name() . '"';
         }