Changeset 40375

Timestamp:

04/04/2017 06:51:39 AM (7 years ago)

Author:

swissspidy

Message:

Customize: Fix failure to collapse expanded sections and panels that become deactivated.

Improve jsdoc for onChangeActive function. Restores fix from [34557] which got dropped in [38648].

Props dlh, westonruter.
See #34391, #33509.
Fixes #39430.

Merges [40304] to the 4.7 branch.

Location:

branches/4.7

Files:

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

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

@@ -529 +529 @@
          * @since 4.1.0
          *
-         * @param {Boolean} active
-         * @param {Object}  args
-         * @param {Object}  args.duration
-         * @param {Object}  args.completeCallback
+         * @param {boolean}  active - The active state to transiution to.
+         * @param {Object}   [args] - Args.
+         * @param {Object}   [args.duration] - The duration for the slideUp/slideDown animation.
+         * @param {boolean}  [args.unchanged] - Whether the state is already known to not be changed, and so short-circuit with calling completeCallback early.
+         * @param {Function} [args.completeCallback] - Function to call when the slideUp/slideDown has completed.
          */
         onChangeActive: function( active, args ) {
@@ -565 +566 @@
             }
 
-            if ( ! $.contains( document, headContainer ) ) {
-                // jQuery.fn.slideUp is not hiding an element if it is not in the DOM
+            if ( ! $.contains( document, headContainer.get( 0 ) ) ) {
+                // If the element is not in the DOM, then jQuery.fn.slideUp() does nothing. In this case, a hard toggle is required instead.
                 headContainer.toggle( active );
                 if ( args.completeCallback ) {
@@ -572 +573 @@
                 }
             } else if ( active ) {
-                headContainer.stop( true, true ).slideDown( duration, args.completeCallback );
+                headContainer.slideDown( duration, args.completeCallback );
             } else {
                 if ( construct.expanded() ) {
@@ -578 +579 @@
                         duration: duration,
                         completeCallback: function() {
-                            headContainer.stop( true, true ).slideUp( duration, args.completeCallback );
+                            headContainer.slideUp( duration, args.completeCallback );
                         }
                     });
                 } else {
-                    headContainer.stop( true, true ).slideUp( duration, args.completeCallback );
+                    headContainer.slideUp( duration, args.completeCallback );
                 }
             }