employer
/
liza
1
0
Fork 0
Code Releases Activity

Group sub-field show/hide support

master
Mike Gerwitz 2016-03-30 14:58:49 -04:00
parent f8eb0e4bca 2fa20c9864
commit 990327a77d
2 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/ui/group/GroupUi.js
View File

@ -747,6 +747,29 @@ module.exports = Class( 'GroupUi' )
},
/**
* Retrieve field elements for show/hide operations
*
* If the field is a child of another field, then only the element
* associated with it will be selected; otherwise, the parent container
* of the field (which may be multiple elements) will be returned.
*
* @param {string} field field name
* @param {number} index field index
*
* @return {jQuery} field elements
*/
'virtual protected getFieldElements': function( field, index )
{
var $element = this.getElementByName( field, index ),
is_sub = $element.parent().hasClass( 'widget' );
return ( !is_sub && $element.parents( 'dd' ).length )
? $element.parents( 'dd' ).prev( 'dt' ).andSelf()
: $element;
},
'public hideField': function( field, index )
{
if ( this.isFieldVisible( field, index ) === false )
@ -764,17 +787,13 @@ module.exports = Class( 'GroupUi' )
'virtual protected doHideField': function( field, index )
{
var $element = this.getElementByName( field, index );
var $elements = this.getFieldElements( field, index );
// fall back to self if we cannot match on $p
var $p = $element.parents( 'dd' ).prev( 'dt' ).andSelf(),
$e = ( $p.length ) ? $p : $element;
$e.stop( true, true ).slideUp( 500, function()
$elements.stop( true, true ).slideUp( 500, function()
{
// be sure to remove the display:none added by jQuery so that we can
// perform our own handling of what it means to be "hidden"
$e.addClass( 'hidden' ).attr( 'style', '' );
$elements.addClass( 'hidden' ).attr( 'style', '' );
} );
},
@ -796,12 +815,7 @@ module.exports = Class( 'GroupUi' )
'virtual protected doShowField': function( field, index )
{
var $element = this.getElementByName( field, index );
// static element or a question
var $elements = ( $element.is( 'dt.static' ) )
? $element
: $element.parents( 'dd' ).prev( 'dt' ).andSelf();
var $elements = this.getFieldElements( field, index );
$elements.find( '.hidden' ).andSelf()
.stop( true, true )

13
src/ui/group/TabbedGroupUi.js
View File

@ -375,13 +375,10 @@ module.exports = Class( 'TabbedGroupUi' )
}, 25 );
}
var $element = this.getElementByName( field, index );
var $elements = ( $element.parents( 'dd' ).length )
? $element.parents( 'dd' ).prev( 'dt' ).andSelf()
: $element;
var $elements = this.getFieldElements( field, index );
$elements.stop( true, true );
if ( this.isOnVisibleTab( field, index ) )
{
$elements.slideUp( 500, function()
@ -410,11 +407,7 @@ module.exports = Class( 'TabbedGroupUi' )
}, 25 );
}
var $element = this.getElementByName( field, index );
var $elements = ( $element.parents( 'dd' ).length )
? $element.parents( 'dd' ).prev( 'dt' ).andSelf()
: $element;
var $elements = this.getFieldElements( field, index );
// it's important to stop animations *before* removing the hidden class,
// since forcing its completion may add it