diff options
| author | Alexander Schmitz <arschmitz@gmail.com> | 2016-05-11 11:49:37 -0400 |
|---|---|---|
| committer | Alexander Schmitz <arschmitz@gmail.com> | 2016-05-26 09:15:48 -0400 |
| commit | 81a8e30c07a3663728c98b15775b5580fa806cdd (patch) | |
| tree | 974431ea32be4c49f07fd1db59f65a77b6467e63 /ui/widgets/controlgroup.js | |
| parent | 04b670e6cc6b25ffe595c665ea86929f71f78b50 (diff) | |
| download | jquery-ui-81a8e30c07a3663728c98b15775b5580fa806cdd.tar.gz jquery-ui-81a8e30c07a3663728c98b15775b5580fa806cdd.zip | |
Controlgroup: Fix issues with compatibility with spinner
Fixes #14966
Diffstat (limited to 'ui/widgets/controlgroup.js')
| -rw-r--r-- | ui/widgets/controlgroup.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/widgets/controlgroup.js b/ui/widgets/controlgroup.js index 641a419ed..34b2ba9c7 100644 --- a/ui/widgets/controlgroup.js +++ b/ui/widgets/controlgroup.js @@ -112,6 +112,11 @@ return $.widget( "ui.controlgroup", { .each( function() { var element = $( this ); var instance = element[ widget ]( "instance" ); + + // If the button is the child of a spinner ignore it + if ( widget === "button" && element.parent( ".ui-spinner" ).length ) { + return; + } if ( instance ) { options.classes = that._resolveClassesValues( options.classes, instance ); } @@ -252,7 +257,6 @@ return $.widget( "ui.controlgroup", { if ( instance && that[ "_" + instance.widgetName + "Options" ] ) { var options = that[ "_" + instance.widgetName + "Options" ]( value ); - options.classes = that._resolveClassesValues( options.classes, instance ); instance.element[ instance.widgetName ]( options ); } else { |