sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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.



git-svn-id: https://develop.svn.wordpress.org/trunk@32743 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Weston Ruter 2015-06-12 22:27:51 +00:00
parent 52cfab850f
commit 4092c5a37e
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/wp-admin/js/customize-controls.js
View File

@ -284,17 +284,27 @@
* @param {Object} args.completeCallback * @param {Object} args.completeCallback
*/ */
onChangeActive: function ( active, args ) { onChangeActive: function ( active, args ) {
var duration = ( 'resolved' === api.previewer.deferred.active.state() ? args.duration : 0 ); var duration, construct = this;
if ( ! $.contains( document, this.container ) ) { 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 // 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 ) { if ( args.completeCallback ) {
args.completeCallback(); args.completeCallback();
} }
} else if ( active ) { } else if ( active ) {
this.container.stop( true, true ).slideDown( duration, args.completeCallback ); construct.container.stop( true, true ).slideDown( duration, args.completeCallback );
} else { } 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 );
}
} }
}, },
@ -596,6 +606,9 @@
position = content.offset().top; position = content.offset().top;
scroll = container.scrollTop(); scroll = container.scrollTop();
content.css( 'margin-top', ( 45 - position - scroll ) ); content.css( 'margin-top', ( 45 - position - scroll ) );
if ( args.completeCallback ) {
args.completeCallback();
}
}; };
} }
@ -616,12 +629,19 @@
expand(); expand();
} }
} else if ( section.container.hasClass( 'open' ) ) { } else if ( ! expanded && section.container.hasClass( 'open' ) ) {
section.container.removeClass( 'open' ); section.container.removeClass( 'open' );
overlay.removeClass( 'section-open' ); overlay.removeClass( 'section-open' );
content.css( 'margin-top', 'inherit' ); content.css( 'margin-top', 'inherit' );
container.scrollTop( 0 ); container.scrollTop( 0 );
section.container.find( '.accordion-section-title' ).focus(); section.container.find( '.accordion-section-title' ).focus();
if ( args.completeCallback ) {
args.completeCallback();
}
} else {
if ( args.completeCallback ) {
args.completeCallback();
}
} }
} }
}); });