Skip to content
Permalink
Browse files

Controlgroup: Fixes for spinner

  • Loading branch information...
arschmitz committed Aug 17, 2015
1 parent 3330634 commit 50a7a3d6a9e4fe0e396661ad32a62f176ab24116
Showing with 31 additions and 8 deletions.
  1. +0 −2 demos/controlgroup/default.html
  2. +24 −2 themes/base/controlgroup.css
  3. +7 −4 ui/widgets/controlgroup.js
@@ -26,15 +26,13 @@
$( ".controlgroup-vertical" ).controlgroup({
"direction": "vertical"
});
$( ".button" ).button();
</script>
</head>
<body>
<div class="widget">
<h1>Controlgroup</h1>
<fieldset>
<legend>Rental Car</legend>
<button class="button">button</button>
<div class="controlgroup">
<select id="car-type">
<option>Compact car</option>
@@ -33,8 +33,10 @@
box-sizing: border-box;
}
.ui-controlgroup .ui-controlgroup-label {
font-size: .83em;
padding: .6em 1em;
padding: .4em 1em;
}
.ui-controlgroup .ui-controlgroup-label span {
font-size: 80%;
}
.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item {
border-left: none;
@@ -45,3 +47,23 @@
.ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content {
border-right: none;
}
.ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content {
border-bottom: none;
}

/* Spinner specific style fixes */
.ui-controlgroup-vertical .ui-spinner {
padding-right: .4em;
}
.ui-controlgroup-vertical .ui-spinner-input {
margin: .4em;
padding: 0;

/* Support IE8, Android < 4.4 */
width: 85%;
width: calc( 100% - 22px );
}
.ui-controlgroup-vertical .ui-spinner .ui-spinner-up {
border-top-style: solid;
}

@@ -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,

0 comments on commit 50a7a3d

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