Changeset 20248 for trunk/wp-includes/class-wp-customize.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.php (modified) (8 diffs)

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

@@ -30 +30 @@
                 add_action( 'admin_footer', array( $this, 'admin_footer' ) );
 
-                add_action( 'customize_previewing',    array( $this, 'customize_previewing' ) );
-                add_action( 'customize_register',      array( $this, 'register_controls' ) );
-                add_action( 'customize_controls_init', array( $this, 'prepare_controls' ) );
+                add_action( 'customize_previewing',               array( $this, 'customize_previewing' ) );
+                add_action( 'customize_register',                 array( $this, 'register_controls' ) );
+                add_action( 'customize_controls_init',            array( $this, 'prepare_controls' ) );
+                add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_control_scripts' ) );
         }
 
@@ -103 +104 @@
                 do_action( 'customize_register' );
 
-                if ( ! $this->is_preview() )
-                        return;
+                if ( $this->is_preview() )
+                        add_action( 'template_redirect', array( $this, 'customize_preview_init' ) );
+        }
+
+        /**
+         * Print javascript settings.
+         *
+         * @since 3.4.0
+         */
+        public function customize_preview_init() {
+                $this->prepare_controls();
 
                 wp_enqueue_script( 'customize-preview' );
@@ -112 +122 @@
                         $setting->preview();
                 }
-        }
+
+                do_action( 'customize_preview_init' );
+        }
+
 
         /**
@@ -350 +363 @@
          */
         public function add_setting( $id, $args = array() ) {
-                $setting = new WP_Customize_Setting( $id, $args );
+                $setting = new WP_Customize_Setting( $this, $id, $args );
 
                 $this->settings[ $setting->id ] = $setting;
@@ -388 +401 @@
          */
         public function add_section( $id, $args = array() ) {
-                $section = new WP_Customize_Section( $id, $args );
+                $section = new WP_Customize_Section( $this, $id, $args );
 
                 $this->sections[ $section->id ] = $section;
@@ -425 +438 @@
          * @param object $b Object B.
          */
-        protected function _cmp_priority( $a, $b ) {
+        protected final function _cmp_priority( $a, $b ) {
                 $ap = $a->priority;
                 $bp = $b->priority;
@@ -435 +448 @@
 
         /**
-         * Prepare settings and sections. Also enqueue needed scripts/styles.
+         * Prepare settings and sections.
          *
          * @since 3.4.0
          */
         public function prepare_controls() {
+                // Prepare settings
                 // Reversing makes uasort sort by time added when conflicts occur.
 
+                $this->settings = array_reverse( $this->settings );
+                $settings = array();
+
+                foreach ( $this->settings as $id => $setting ) {
+                        if ( ! isset( $this->sections[ $setting->section ] ) || ! $setting->check_capabilities() )
+                                continue;
+
+                        $this->sections[ $setting->section ]->settings[] = $setting;
+                        $settings[ $id ] = $setting;
+                }
+                $this->settings = $settings;
+
+                // Prepare sections
                 $this->sections = array_reverse( $this->sections );
                 uasort( $this->sections, array( $this, '_cmp_priority' ) );
-
-                $this->settings = array_reverse( $this->settings );
+                $sections = array();
+
+                foreach ( $this->sections as $section ) {
+                        if ( ! $section->check_capabilities() )
+                                continue;
+
+                        usort( $section->settings, array( $this, '_cmp_priority' ) );
+                        $sections[] = $section;
+                }
+                $this->sections = $sections;
+        }
+
+        /**
+         * Enqueue scripts for customize controls.
+         *
+         * @since 3.4.0
+         */
+        public function enqueue_control_scripts() {
                 foreach ( $this->settings as $setting ) {
-                        if ( ! isset( $this->sections[ $setting->section ] ) )
-                                continue;
-
-                        $this->sections[ $setting->section ]->settings[] = $setting;
-
-                        if ( $setting->check_capabilities() )
-                                $setting->enqueue();
-                }
-
-                foreach ( $this->sections as $section ) {
-                        usort( $section->settings, array( $this, '_cmp_priority' ) );
+                        $setting->enqueue();
                 }
         }
@@ -480 +513 @@
                         'sanitize_callback' => 'sanitize_hexcolor',
                         'control'           => 'color',
+                        'theme_supports'    => array( 'custom-header', 'header-text' ),
                         'default'           => get_theme_support( 'custom-header', 'default-text-color' ),
                 ) );