Ticket #29758: 29758.2.diff

src/wp-admin/js/customize-controls.js

@@ -80 +80 @@
                         bubbleChildValueChanges( self, [ 'priority', 'active' ] );
 
                         self.priority.set( isNaN( self.params.priority ) ? 100 : self.params.priority );
-                        self.active.set( true ); // @todo pass from params, eventually from active_callback when defining panel/section
+                        self.active.set( self.params.active );
                         self.expanded.set( false ); // @todo True if deeplinking?
                 },
 
@@ -1101 +1101 @@
                                 loaded = false,
                                 ready  = false;
 
-                        if ( this._ready )
+                        if ( this._ready ) {
                                 this.unbind( 'ready', this._ready );
+                        }
 
                         this._ready = function() {
                                 ready = true;
 
-                                if ( loaded )
+                                if ( loaded ) {
                                         deferred.resolveWith( self );
+                                }
                         };
 
                         this.bind( 'ready', this._ready );
 
                         this.bind( 'ready', function ( data ) {
-                                if ( ! data || ! data.activeControls ) {
+                                if ( ! data ) {
                                         return;
                                 }
 
-                                $.each( data.activeControls, function ( id, active ) {
-                                        var control = api.control( id );
-                                        if ( control ) {
-                                                control.active( active );
+                                var constructs = {
+                                        panel: data.activePanels,
+                                        section: data.activeSections,
+                                        control: data.activeControls
+                                };
+
+                                $.each( constructs, function ( type, activeConstructs ) {
+                                        if ( activeConstructs ) {
+                                                $.each( activeConstructs, function ( id, active ) {
+                                                        var construct = api[ type ]( id );
+                                                        if ( construct ) {
+                                                                construct.active( active );
+                                                        }
+                                                } );
                                         }
                                 } );
+
                         } );
 
                         this.request = $.ajax( this.previewUrl(), {
@@ -1145 +1158 @@
 
                                 // Check if the location response header differs from the current URL.
                                 // If so, the request was redirected; try loading the requested page.
-                                if ( location && location != self.previewUrl() ) {
+                                if ( location && location !== self.previewUrl() ) {
                                         deferred.rejectWith( self, [ 'redirect', location ] );
                                         return;
                                 }

src/wp-includes/class-wp-customize-manager.php

@@ -491 +491 @@
                 $settings = array(
                         'values'  => array(),
                         'channel' => wp_unslash( $_POST['customize_messenger_channel'] ),
+                        'activePanels' => array(),
+                        'activeSections' => array(),
                         'activeControls' => array(),
                 );
 
@@ -504 +506 @@
                 foreach ( $this->settings as $id => $setting ) {
                         $settings['values'][ $id ] = $setting->js_value();
                 }
+                foreach ( $this->panels as $id => $panel ) {
+                        $settings['activePanels'][ $id ] = $panel->active();
+                }
+                foreach ( $this->sections as $id => $section ) {
+                        $settings['activeSections'][ $id ] = $section->active();
+                }
                 foreach ( $this->controls as $id => $control ) {
                         $settings['activeControls'][ $id ] = $control->active();
                 }

src/wp-includes/class-wp-customize-panel.php

@@ -90 +90 @@
         public $type;
 
         /**
+         * Callback.
+         *
+         * @since 4.1.0
+         * @access public
+         *
+         * @see WP_Customize_Section::active()
+         *
+         * @var callable Callback is called with one argument, the instance of
+         *               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 = '';
+
+        /**
          * Constructor.
          *
          * Any supplied $args override class property defaults.
@@ -110 +125 @@
 
                 $this->manager = $manager;
                 $this->id = $id;
+                if ( empty( $this->active_callback ) ) {
+                        $this->active_callback = array( $this, 'active_callback' );
+                }
 
                 $this->sections = array(); // Users cannot customize the $sections array.
 
@@ -117 +135 @@
         }
 
         /**
+         * Check whether panel is active to current Customizer preview.
+         *
+         * @since 4.1.0
+         * @access public
+         *
+         * @return bool Whether the panel is active to the current preview.
+         */
+        public final function active() {
+                $panel = $this;
+                $active = call_user_func( $this->active_callback, $this );
+
+                /**
+                 * Filter response of WP_Customize_Panel::active().
+                 *
+                 * @since 4.1.0
+                 *
+                 * @param bool                 $active  Whether the Customizer panel is active.
+                 * @param WP_Customize_Panel $panel WP_Customize_Panel instance.
+                 */
+                $active = apply_filters( 'customize_panel_active', $active, $panel );
+
+                return $active;
+        }
+
+        /**
+         * Default callback used when invoking WP_Customize_Panel::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.
+         */
+        public function active_callback() {
+                return true;
+        }
+
+        /**
          * Gather the parameters passed to client JavaScript via JSON.
          *
          * @since 4.1.0
@@ -126 +184 @@
         public function json() {
                 $array = wp_array_slice_assoc( (array) $this, array( 'title', 'description', 'priority', 'type' ) );
                 $array['content'] = $this->get_content();
+                $array['active'] = $this->active();
                 return $array;
         }
 

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

@@ -99 +99 @@
         public $type;
 
         /**
+         * Callback.
+         *
+         * @since 4.1.0
+         * @access public
+         *
+         * @see WP_Customize_Section::active()
+         *
+         * @var callable Callback is called with one argument, the instance of
+         *               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 = '';
+
+        /**
          * Constructor.
          *
          * Any supplied $args override class property defaults.
@@ -112 +127 @@
         public function __construct( $manager, $id, $args = array() ) {
                 $keys = array_keys( get_object_vars( $this ) );
                 foreach ( $keys as $key ) {
-                        if ( isset( $args[ $key ] ) )
+                        if ( isset( $args[ $key ] ) ) {
                                 $this->$key = $args[ $key ];
+                        }
                 }
 
                 $this->manager = $manager;
                 $this->id = $id;
+                if ( empty( $this->active_callback ) ) {
+                        $this->active_callback = array( $this, 'active_callback' );
+                }
 
                 $this->controls = array(); // Users cannot customize the $controls array.
 
@@ -125 +144 @@
         }
 
         /**
+         * 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.
+         */
+        public final function active() {
+                $section = $this;
+                $active = call_user_func( $this->active_callback, $this );
+
+                /**
+                 * Filter response of WP_Customize_Section::active().
+                 *
+                 * @since 4.1.0
+                 *
+                 * @param bool                 $active  Whether the Customizer section is active.
+                 * @param WP_Customize_Section $section WP_Customize_Section instance.
+                 */
+                $active = apply_filters( 'customize_section_active', $active, $section );
+
+                return $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.
+         */
+        public function active_callback() {
+                return true;
+        }
+
+        /**
          * Gather the parameters passed to client JavaScript via JSON.
          *
          * @since 4.1.0
@@ -134 +193 @@
         public function json() {
                 $array = wp_array_slice_assoc( (array) $this, array( 'title', 'description', 'priority', 'panel', 'type' ) );
                 $array['content'] = $this->get_content();
+                $array['active'] = $this->active();
                 return $array;
         }
 
@@ -146 +206 @@
          * @return bool False if theme doesn't support the section or user doesn't have the capability.
          */
         public final function check_capabilities() {
-                if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) )
+                if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) ) {
                         return false;
+                }
 
-                if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) )
+                if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) ) {
                         return false;
+                }
 
                 return true;
         }
@@ -176 +238 @@
          * @since 3.4.0
          */
         public final function maybe_render() {
-                if ( ! $this->check_capabilities() )
+                if ( ! $this->check_capabilities() ) {
                         return;
+                }
 
                 /**
                  * Fires before rendering a Customizer section.

src/wp-includes/js/customize-preview.js

@@ -107 +107 @@
         });
 
                 preview.send( 'ready', {
+                        activePanels: api.settings.activePanels,
+                        activeSections: api.settings.activeSections,
                         activeControls: api.settings.activeControls
                 } );