Changeset 32119

Timestamp:

04/13/2015 10:09:35 PM (11 years ago)

Author:

ocean90

Message:

Customizer Theme Switcher: Don't re-render a theme control if it has already been rendered.

Move initialization of $customizeSidebar to api.ThemesSection.initialize() to prevent cases where the result can be undefined.

props westonruter, ocean90.
fixes #31793.

File:

• trunk/src/wp-admin/js/customize-controls.js (modified) (3 diffs)

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

@@ -555 +555 @@
                 screenshotQueue: null,
                 $window: $( window ),
-                $customizeSidebar: $( '.wp-full-overlay-sidebar-content:first' ),
+
+                /**
+                 * @since 4.2.0
+                 */
+                initialize: function () {
+                        this.$customizeSidebar = $( '.wp-full-overlay-sidebar-content:first' );
+                        return api.Section.prototype.initialize.apply( this, arguments );
+                },
 
                 /**
@@ -1952 +1959 @@
 
                 touchDrag: false,
+                isRendered: false,
 
                 /**
@@ -1962 +1970 @@
                                 renderContentArgs = arguments;
 
-                        api.section( control.section(), function ( section ) {
+                        api.section( control.section(), function( section ) {
                                 if ( section.expanded() ) {
                                         api.Control.prototype.renderContent.apply( control, renderContentArgs );
+                                        control.isRendered = true;
                                 } else {
-                                        section.expanded.bind( function ( expanded ) {
-                                                if ( expanded ) {
+                                        section.expanded.bind( function( expanded ) {
+                                                if ( expanded && ! control.isRendered ) {
                                                         api.Control.prototype.renderContent.apply( control, renderContentArgs );
+                                                        control.isRendered = true;
                                                 }
                                         } );