Skip to content
Permalink
Browse files

Controlgroup: Typos and minor style fixes

  • Loading branch information...
arschmitz committed Sep 30, 2015
1 parent 874011e commit dbadc01fbd846d90cd01e34bc1c8f9194545f7f3
Showing with 26 additions and 22 deletions.
  1. +26 −22 ui/widgets/controlgroup.js
@@ -12,7 +12,8 @@
//>>description: Visually groups form control widgets
//>>docs: http://api.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

( function( factory ) {
@@ -71,36 +72,39 @@ return $.widget( "ui.controlgroup", {
var widgets, labels,
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
if ( $.fn[ widget ] && selector ) {

// 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 ] );
} );
if ( !$.fn[ widget ] || !selector ) {
return;
} else if ( selector && widget === "controlgroupLabel" ) {
labels = that.element.find( selector );
labels.each( function() {
$( this ).contents().wrapAll( "<span class='ui-controlgroup-label-contents'></span>" );
} );
that._addClass( labels, null, "ui-widget ui-widget-content ui-state-default" );
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 ) );

0 comments on commit dbadc01

Please sign in to comment.
You can’t perform that action at this time.