Controlgroup: Typos and minor style fixes

This commit is contained in:
Alexander Schmitz 2015-09-30 11:47:33 -04:00
parent 874011ef0a
commit dbadc01fbd

View File

@ -12,7 +12,8 @@
//>>description: Visually groups form control widgets //>>description: Visually groups form control widgets
//>>docs: http://api.jqueryui.com/controlgroup/ //>>docs: http://api.jqueryui.com/controlgroup/
//>>demos: http://jqueryui.com/controlgroup/ //>>demos: http://jqueryui.com/controlgroup/
//>>css.structure: ../themes/base/core.css, ../themes/base/controlgroup.css //>>css.structure: ../themes/base/core.css
//>>css.structure: ../themes/base/controlgroup.css
//>>css.theme: ../themes/base/theme.css //>>css.theme: ../themes/base/theme.css
( function( factory ) { ( function( factory ) {
@ -71,28 +72,9 @@ return $.widget( "ui.controlgroup", {
var widgets, labels, var widgets, labels,
options = {}; options = {};
// We assume everything is in the middle to start because we can't determine
// first / last elements until all enhancments are done.
if ( that[ "_" + widget + "Options" ] ) {
options = that[ "_" + widget + "Options" ]( "middle" );
}
// Make sure the widget actually exists and has a selector set // Make sure the widget actually exists and has a selector set
if ( $.fn[ widget ] && selector ) { if ( !$.fn[ widget ] || !selector ) {
return;
// Find instances of this widget inside controlgroup and init them
widgets = that.element.find( selector )[ widget ]( options );
widgets.each( function() {
var element = $( this );
// Store an instance of the controlgroup to be able to reference it later
var widgetElement = element[ widget ]( "widget" );
$.data( widgetElement[ 0 ], "ui-controlgroup-data",
element[ widget ]( "instance" ) );
childWidgets.push( widgetElement[ 0 ] );
} );
} else if ( selector && widget === "controlgroupLabel" ) { } else if ( selector && widget === "controlgroupLabel" ) {
labels = that.element.find( selector ); labels = that.element.find( selector );
labels.each( function() { labels.each( function() {
@ -100,7 +82,29 @@ return $.widget( "ui.controlgroup", {
} ); } );
that._addClass( labels, null, "ui-widget ui-widget-content ui-state-default" ); that._addClass( labels, null, "ui-widget ui-widget-content ui-state-default" );
childWidgets = childWidgets.concat( labels.get() ); childWidgets = childWidgets.concat( labels.get() );
return;
} }
// We assume everything is in the middle to start because we can't determine
// first / last elements until all enhancments are done.
if ( that[ "_" + widget + "Options" ] ) {
options = that[ "_" + widget + "Options" ]( "middle" );
}
// Find instances of this widget inside controlgroup and init them
widgets = that.element.find( selector )[ widget ]( options );
widgets.each( function() {
var element = $( this );
// Store an instance of the controlgroup to be able to reference
// from the outermost element for changing options and refresh
var widgetElement = element[ widget ]( "widget" );
$.data( widgetElement[ 0 ], "ui-controlgroup-data",
element[ widget ]( "instance" ) );
childWidgets.push( widgetElement[ 0 ] );
} );
} ); } );
this.childWidgets = $( $.unique( childWidgets ) ); this.childWidgets = $( $.unique( childWidgets ) );