Changeset 32743

Timestamp:

06/12/2015 10:27:51 PM (10 years ago)

Author:

westonruter

Message:

Fix regressions from [32649] wrt Customizer expanded and active state changes for sections.

The args.completeCallback was not always called when onChangeExpanded() was called. And when a section became inactive (active state goes to false) and it was currently expanded, the Customizer panel would then becomes blank as the section was hidden; it needed to collapse() the section first before hiding the element.

See #31336.

File:

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

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

@@ -285 +285 @@
          */
         onChangeActive: function ( active, args ) {
-            var duration = ( 'resolved' === api.previewer.deferred.active.state() ? args.duration : 0 );
-            if ( ! $.contains( document, this.container ) ) {
+            var duration, construct = this;
+            duration = ( 'resolved' === api.previewer.deferred.active.state() ? args.duration : 0 );
+            if ( ! $.contains( document, construct.container[0] ) ) {
                 // jQuery.fn.slideUp is not hiding an element if it is not in the DOM
-                this.container.toggle( active );
+                construct.container.toggle( active );
                 if ( args.completeCallback ) {
                     args.completeCallback();
                 }
             } else if ( active ) {
-                this.container.stop( true, true ).slideDown( duration, args.completeCallback );
+                construct.container.stop( true, true ).slideDown( duration, args.completeCallback );
             } else {
-                this.container.stop( true, true ).slideUp( duration, args.completeCallback );
+                if ( construct.expanded() ) {
+                    construct.collapse({
+                        duration: duration,
+                        completeCallback: function() {
+                            construct.container.stop( true, true ).slideUp( duration, args.completeCallback );
+                        }
+                    });
+                } else {
+                    construct.container.stop( true, true ).slideUp( duration, args.completeCallback );
+                }
             }
         },
@@ -597 +607 @@
                         scroll = container.scrollTop();
                         content.css( 'margin-top', ( 45 - position - scroll ) );
+                        if ( args.completeCallback ) {
+                            args.completeCallback();
+                        }
                     };
                 }
@@ -617 +630 @@
                 }
 
-            } else if ( section.container.hasClass( 'open' ) ) {
+            } else if ( ! expanded && section.container.hasClass( 'open' ) ) {
                 section.container.removeClass( 'open' );
                 overlay.removeClass( 'section-open' );
@@ -623 +636 @@
                 container.scrollTop( 0 );
                 section.container.find( '.accordion-section-title' ).focus();
+                if ( args.completeCallback ) {
+                    args.completeCallback();
+                }
+            } else {
+                if ( args.completeCallback ) {
+                    args.completeCallback();
+                }
             }
         }