Changeset 33941 for branches/4.3

Timestamp:

09/07/2015 06:13:17 AM (11 years ago)

Author:

westonruter

Message:

Customizer: Ensure persistence of unchanged active state for controls, sections, and panels.

Cherry-picks [33754] onto 4.3 branch.
Props nikeo, westonruter.
Fixes #33428 for 4.3.
See also #33494.

File:

• branches/4.3/src/wp-admin/js/customize-controls.js (modified) (2 diffs)

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

@@ -287 +287 @@
                  * @param {Object}  args.completeCallback
                  */
-                onChangeActive: function ( active, args ) {
+                onChangeActive: function( active, args ) {
                         var duration, construct = this;
+                        if ( args.unchanged ) {
+                                if ( args.completeCallback ) {
+                                        args.completeCallback();
+                                }
+                                return;
+                        }
+
                         duration = ( 'resolved' === api.previewer.deferred.active.state() ? args.duration : 0 );
                         if ( ! $.contains( document, construct.container[0] ) ) {
@@ -1500 +1507 @@
                  */
                 onChangeActive: function ( active, args ) {
+                        if ( args.unchanged ) {
+                                if ( args.completeCallback ) {
+                                        args.completeCallback();
+                                }
+                                return;
+                        }
+
                         if ( ! $.contains( document, this.container ) ) {
                                 // jQuery.fn.slideUp is not hiding an element if it is not in the DOM