diff options
| author | Alexander Schmitz <arschmitz@gmail.com> | 2015-08-17 08:43:31 -0400 |
|---|---|---|
| committer | Alexander Schmitz <arschmitz@gmail.com> | 2015-10-08 14:02:47 -0400 |
| commit | 50a7a3d6a9e4fe0e396661ad32a62f176ab24116 (patch) | |
| tree | 1092afa5a64e2d8217beb2b420acc840cc8de046 /ui/widgets/controlgroup.js | |
| parent | 3330634c4e4e6a1a7deff56a2d278ed9d8db0ce9 (diff) | |
| download | jquery-ui-50a7a3d6a9e4fe0e396661ad32a62f176ab24116.tar.gz jquery-ui-50a7a3d6a9e4fe0e396661ad32a62f176ab24116.zip | |
Controlgroup: Fixes for spinner
Diffstat (limited to 'ui/widgets/controlgroup.js')
| -rw-r--r-- | ui/widgets/controlgroup.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ui/widgets/controlgroup.js b/ui/widgets/controlgroup.js index 4e68ad7a8..c895ab09e 100644 --- a/ui/widgets/controlgroup.js +++ b/ui/widgets/controlgroup.js @@ -97,6 +97,9 @@ return $.widget( "ui.controlgroup", { } ); } 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" ); Array.prototype.push.apply( childWidgets, labels.get() ); } @@ -117,9 +120,9 @@ return $.widget( "ui.controlgroup", { }, _updateCornerClass: function( element, position ) { - var remove = "ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right", - add = - this._buildSimpleOptions( position, this.options.direction, "label" ).classes.label; + var direction = this.options.direction === "vertical" + remove = "ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right", + add = this._buildSimpleOptions( position, direction, "label" ).classes.label; this._removeClass( element, null, remove ); this._addClass( element, null, add ); @@ -219,7 +222,7 @@ return $.widget( "ui.controlgroup", { $.each( [ "first", "last" ], function( index, value ) { var instance = children[ value ]().data( "ui-controlgroup-data" ); - if ( that[ "_" + instance.widgetName + "_options" ] ) { + if ( instance && that[ "_" + instance.widgetName + "_options" ] ) { instance.element[ instance.widgetName ]( that[ "_" + instance.widgetName + "_options" ]( value, |