diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-includes/class-wp-customize-section.php --- a/wp/wp-includes/class-wp-customize-section.php Tue Jun 09 11:14:17 2015 +0000 +++ b/wp/wp-includes/class-wp-customize-section.php Mon Oct 14 17:39:30 2019 +0200 @@ -24,7 +24,8 @@ * Used when sorting two instances whose priorities are equal. * * @since 4.1.0 - * @access protected + * + * @static * @var int */ protected static $instance_count = 0; @@ -33,7 +34,6 @@ * Order in which this instance was created in relation to other instances. * * @since 4.1.0 - * @access public * @var int */ public $instance_number; @@ -42,7 +42,6 @@ * WP_Customize_Manager instance. * * @since 3.4.0 - * @access public * @var WP_Customize_Manager */ public $manager; @@ -51,7 +50,6 @@ * Unique identifier. * * @since 3.4.0 - * @access public * @var string */ public $id; @@ -60,7 +58,6 @@ * Priority of the section which informs load order of sections. * * @since 3.4.0 - * @access public * @var integer */ public $priority = 160; @@ -69,7 +66,6 @@ * Panel in which to show the section, making it a sub-section. * * @since 4.0.0 - * @access public * @var string */ public $panel = ''; @@ -78,7 +74,6 @@ * Capability required for the section. * * @since 3.4.0 - * @access public * @var string */ public $capability = 'edit_theme_options'; @@ -87,7 +82,6 @@ * Theme feature support for the section. * * @since 3.4.0 - * @access public * @var string|array */ public $theme_supports = ''; @@ -96,7 +90,6 @@ * Title of the section to show in UI. * * @since 3.4.0 - * @access public * @var string */ public $title = ''; @@ -105,7 +98,6 @@ * Description to show in the UI. * * @since 3.4.0 - * @access public * @var string */ public $description = ''; @@ -114,7 +106,6 @@ * Customizer controls for this section. * * @since 3.4.0 - * @access public * @var array */ public $controls; @@ -123,7 +114,6 @@ * Type of this section. * * @since 4.1.0 - * @access public * @var string */ public $type = 'default'; @@ -132,18 +122,28 @@ * Active callback. * * @since 4.1.0 - * @access public * * @see WP_Customize_Section::active() * * @var callable Callback is called with one argument, the instance of - * {@see WP_Customize_Section}, and returns bool to indicate - * whether the section is active (such as it relates to the URL - * currently being previewed). + * WP_Customize_Section, and returns bool to indicate whether + * the section is active (such as it relates to the URL currently + * being previewed). */ public $active_callback = ''; /** + * Show the description or hide it behind the help icon. + * + * @since 4.7.0 + * + * @var bool Indicates whether the Section's description should be + * hidden behind a help icon ("?") in the Section header, + * similar to how help icons are displayed on Panels. + */ + public $description_hidden = false; + + /** * Constructor. * * Any supplied $args override class property defaults. @@ -177,7 +177,6 @@ * Check whether section is active to current Customizer preview. * * @since 4.1.0 - * @access public * * @return bool Whether the section is active to the current preview. */ @@ -186,12 +185,12 @@ $active = call_user_func( $this->active_callback, $this ); /** - * Filter response of {@see WP_Customize_Section::active()}. + * Filters response of WP_Customize_Section::active(). * * @since 4.1.0 * * @param bool $active Whether the Customizer section is active. - * @param WP_Customize_Section $section {@see WP_Customize_Section} instance. + * @param WP_Customize_Section $section WP_Customize_Section instance. */ $active = apply_filters( 'customize_section_active', $active, $section ); @@ -199,15 +198,14 @@ } /** - * Default callback used when invoking {@see WP_Customize_Section::active()}. + * Default callback used when invoking WP_Customize_Section::active(). * * Subclasses can override this with their specific logic, or they may provide * an 'active_callback' argument to the constructor. * * @since 4.1.0 - * @access public * - * @return bool Always true. + * @return true Always true. */ public function active_callback() { return true; @@ -221,10 +219,19 @@ * @return array The array to be exported to the client as JSON. */ public function json() { - $array = wp_array_slice_assoc( (array) $this, array( 'title', 'description', 'priority', 'panel', 'type' ) ); + $array = wp_array_slice_assoc( (array) $this, array( 'id', 'description', 'priority', 'panel', 'type', 'description_hidden' ) ); + $array['title'] = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) ); $array['content'] = $this->get_content(); $array['active'] = $this->active(); $array['instanceNumber'] = $this->instance_number; + + if ( $this->panel ) { + /* translators: ▸ is the unicode right-pointing triangle, and %s is the section title in the Customizer */ + $array['customizeAction'] = sprintf( __( 'Customizing ▸ %s' ), esc_html( $this->manager->get_panel( $this->panel )->title ) ); + } else { + $array['customizeAction'] = __( 'Customizing' ); + } + return $array; } @@ -249,7 +256,7 @@ } /** - * Get the section's content template for insertion into the Customizer pane. + * Get the section's content for insertion into the Customizer pane. * * @since 4.1.0 * @@ -258,9 +265,7 @@ final public function get_content() { ob_start(); $this->maybe_render(); - $template = trim( ob_get_contents() ); - ob_end_clean(); - return $template; + return trim( ob_get_clean() ); } /** @@ -295,159 +300,99 @@ } /** - * Render the section, and the controls that have been added to it. + * Render the section UI in a subclass. + * + * Sections are now rendered in JS by default, see WP_Customize_Section::print_template(). * * @since 3.4.0 */ - protected function render() { - $classes = 'accordion-section control-section control-section-' . $this->type; + protected function render() {} + + /** + * Render the section's JS template. + * + * This function is only run for section types that have been registered with + * WP_Customize_Manager::register_section_type(). + * + * @since 4.3.0 + * + * @see WP_Customize_Manager::render_template() + */ + public function print_template() { ?> -
  • + + +

  • - title ); ?> - + {{ data.title }} +

    • type; - ?> -
  • -

    - manager->is_theme_active() ) { - /* translators: %s: theme name */ - printf( __( 'Active theme %s' ), $this->title ); - } else { - /* translators: %s: theme name */ - printf( __( 'Previewing theme %s' ), $this->title ); - } - ?> - - -

    -
    -

    - - controls ) + 1 /* Active theme */; ?> -

    +/** WP_Customize_Sidebar_Section class */ +require_once( ABSPATH . WPINC . '/customize/class-wp-customize-sidebar-section.php' ); -

    - manager->is_theme_active() ) { - /* translators: %s: theme name */ - printf( __( 'Active theme %s' ), $this->title ); - } else { - /* translators: %s: theme name */ - printf( __( 'Previewing theme %s' ), $this->title ); - } - ?> - -

    - - - -
    - controls ) > 4 ) : ?> -

    - -
    -
      -
    -
    -
    -
    • -sidebar_id; - return $json; - } - - /** - * Whether the current sidebar is rendered on the page. - * - * @since 4.1.0 - * @access public - * - * @return bool Whether sidebar is rendered. - */ - public function active_callback() { - return $this->manager->widgets->is_sidebar_rendered( $this->sidebar_id ); - } -} +require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-section.php' );