• Default functionality
+<<<<<<< HEAD
• Split Button
+======= +>>>>>>> c21dcbd... Controlgroup: Updating last refrences from buttonset to controlgroup
• Toolbar

 The Rime of the Ancient Mariner (text of 1834)
 BY SAMUEL TAYLOR COLERIDGE
-Argument 
+Argument
 
 How a Ship having passed the Line was driven by storms to the cold Country towards the South Pole;
 and how from thence she made her course to the tropical Latitude of the Great Pacific Ocean; and 
diff --git a/demos/index.html b/demos/index.html
index 4b4d04e06b5..89375dde704 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -12,6 +12,7 @@
 	
autocomplete
 	
button
 	
checkboxradio
+	
controlgroup
 	
datepicker
 	
dialog
 	
draggable
diff --git a/demos/tooltip/video-player.html b/demos/tooltip/video-player.html
index 23747bb204f..986be0d25da 100644
--- a/demos/tooltip/video-player.html
+++ b/demos/tooltip/video-player.html
@@ -10,6 +10,7 @@
 	
 	
 	
+	
 	
 	
 	
@@ -78,8 +79,10 @@
 				notify( button );
 			});
 		});
-		$( ".set" ).buttonset({
-			items: "button"
+		$( ".set" ).controlgroup({
+			items: {
+				"button" : "button"
+			}
 		});
 
 		$( "button.menu" )
diff --git a/tests/unit/controlgroup/controlgroup.html b/tests/unit/controlgroup/controlgroup.html
new file mode 100644
index 00000000000..5b97d5378ec
--- /dev/null
+++ b/tests/unit/controlgroup/controlgroup.html
@@ -0,0 +1,61 @@
+
+
+
+	
+	
+
+	
+	
+	
+	
+	
+	
+
+	
+	
+	
+	
+	
+
+
+
+

+

+	

+		Button with icon only
+		
+			Fast
+			Medium
+			Slow
+		
+		Checkbox
+		
+		
+			Fast
+			Medium
+			Slow
+		
+		Button with icon on the bottom
+		
+			Fast
+			Medium
+			Slow
+		
+	
+
+
+
diff --git a/tests/unit/controlgroup/controlgroup_common.js b/tests/unit/controlgroup/controlgroup_common.js
new file mode 100644
index 00000000000..53f722b7ce2
--- /dev/null
+++ b/tests/unit/controlgroup/controlgroup_common.js
@@ -0,0 +1,15 @@
+TestHelpers.commonWidgetTests( "controlgroup", {
+	defaults: {
+		disabled: null,
+		items: {
+			"button": "input[type=button], input[type=submit], input[type=reset], button, a",
+			"checkboxradio": "input[type='checkbox'], input[type='radio']",
+			"selectmenu": "select"
+		},
+		direction: "horizontal",
+		excludeInvisible: true,
+
+		// Callbacks
+		create: null
+	}
+});
diff --git a/tests/unit/controlgroup/controlgroup_core.js b/tests/unit/controlgroup/controlgroup_core.js
index e69de29bb2d..98c53170f67 100644
--- a/tests/unit/controlgroup/controlgroup_core.js
+++ b/tests/unit/controlgroup/controlgroup_core.js
@@ -0,0 +1,89 @@
+module( "Controlgroup: Core" );
+
+function hasCornerClass( className, element ) {
+	if ( className ) {
+		return element.hasClass( className );
+	}
+
+	return element.attr( "class" ).match( /ui-corner/g );
+}
+
+test( "selectmenu: open/close corners", function() {
+	expect( 1 );
+	var element = $( ".controlgroup" ).controlgroup(),
+		selects = element.find( "select" ),
+		selectButton = selects.eq( 0 ).selectmenu( "widget" );
+
+		expect( 12 );
+
+		selects.eq( 0 ).selectmenu( "open" );
+
+		strictEqual( selectButton.hasClass( "ui-corner-tl" ), true,
+			"Horizontal: First selectmenu gets ui-corner-tl when opened" );
+
+		selects.eq( 0 ).selectmenu( "close" );
+
+		strictEqual( selectButton.hasClass( "ui-corner-left" ), true,
+			"Horizontal: First selectmenu gets ui-corner-left when closed" );
+
+		selectButton = selects.eq( 1 ).selectmenu( "widget" );
+
+		selects.eq( 1 ).selectmenu( "open" );
+
+		strictEqual( !!hasCornerClass( false, selectButton ), false,
+			"Horizontal: Middle selectmenu does not get corner class when opened" );
+
+		selects.eq( 1 ).selectmenu( "close" );
+
+		strictEqual( !!hasCornerClass( false, selectButton ), false,
+			"Horizontal: Middle selectmenu does not get corner class when closed" );
+
+		selectButton = selects.eq( 2 ).selectmenu( "widget" );
+
+		selects.eq( 2 ).selectmenu( "open" );
+
+		strictEqual( selectButton.hasClass( "ui-corner-tr" ), true,
+			"Horizontal: Last selectmenu gets ui-corner-tr when opened" );
+
+		selects.eq( 2 ).selectmenu( "close" );
+
+		strictEqual( selectButton.hasClass( "ui-corner-right" ), true,
+			"Horizontal: Last selectmenu gets ui-corner-right when closed" );
+
+		element.controlgroup( "option", "direction", "vertical" );
+		selectButton = selects.eq( 0 ).selectmenu( "widget" );
+
+		selects.eq( 0 ).selectmenu( "open" );
+
+		strictEqual( selectButton.hasClass( "ui-corner-top" ), true,
+			"vertical: First selectmenu gets ui-corner-top when opened" );
+
+		selects.eq( 0 ).selectmenu( "close" );
+
+		strictEqual( selectButton.hasClass( "ui-corner-top" ), true,
+			"vertical: First selectmenu gets ui-corner-top when closed" );
+
+		selectButton = selects.eq( 1 ).selectmenu( "widget" );
+
+		selects.eq( 1 ).selectmenu( "open" );
+
+		strictEqual( !!hasCornerClass( false, selectButton ), false,
+			"vertical: Middle selectmenu does not get corner class when opened" );
+
+		selects.eq( 1 ).selectmenu( "close" );
+
+		strictEqual( !!hasCornerClass( false, selectButton ), false,
+			"vertical: Middle selectmenu does not get corner class when closed" );
+
+		selectButton = selects.eq( 2 ).selectmenu( "widget" );
+
+		selects.eq( 2 ).selectmenu( "open" );
+
+		strictEqual( !!hasCornerClass( false, selectButton ), false,
+			"vertical: Last selectmenu does not get corner class when opened" );
+
+		selects.eq( 2 ).selectmenu( "close" );
+
+		strictEqual( selectButton.hasClass( "ui-corner-bottom" ), true,
+			"vertical: Last selectmenu gets ui-corner-bottom when closed" );
+});
\ No newline at end of file
diff --git a/tests/unit/controlgroup/controlgroup_methods.js b/tests/unit/controlgroup/controlgroup_methods.js
new file mode 100644
index 00000000000..90715055a6e
--- /dev/null
+++ b/tests/unit/controlgroup/controlgroup_methods.js
@@ -0,0 +1,130 @@
+module( "Controlgroup: methods" );
+
+test( "destroy", function() {
+	expect( 1 );
+	domEqual( ".controlgroup", function() {
+		$( ".controlgroup" ).controlgroup().controlgroup( "destroy" );
+	});
+});
+test( "disable", function() {
+	var tests = 1,
+		element = $( ".controlgroup" ).controlgroup().controlgroup( "disable" );
+	strictEqual( element.hasClass( "ui-state-disabled" ), false,
+		"ui-state-disabled is not present on widget after disabling" );
+	$.each( $.ui.controlgroup.prototype.options.items, function( widget, selector ){
+		element.children( selector ).each(function(){
+			expect( ++tests );
+			strictEqual( $( this )[ widget ]( "widget" ).hasClass( "ui-state-disabled"), true,
+				"Child " + widget + " widgets are disabled" );
+		});
+	});
+});
+
+test( "enable", function() {
+	var tests = 1,
+		element = $( ".controlgroup" ).controlgroup().controlgroup( "enable" );
+	strictEqual( element.hasClass( "ui-state-disabled" ), false,
+		"ui-state-disabled is not present on widget after enabling" );
+	$.each( $.ui.controlgroup.prototype.options.items, function( widget, selector ){
+		element.children( selector ).each(function(){
+			expect( ++tests );
+			strictEqual( $( this )[ widget ]( "widget" ).hasClass( "ui-state-disabled"), false,
+				"Child " + widget + " widgets are not disabled" );
+		});
+	});
+});
+
+function hasCornerClass( className, element ) {
+	if ( className ) {
+		return element.hasClass( className );
+	}
+
+	return element.attr( "class" ).match( /ui-corner/g );
+}
+test( "refresh", function() {
+	var count = 0,
+		tests = {
+			"checkboxradio": "",
+			"selectmenu": "foo",
+			"button": ""
+		},
+		orientations = {
+			"horizontal": [
+				"ui-corner-left",
+				false,
+				false,
+				"ui-corner-right"
+			],
+			"vertical": [
+				"ui-corner-top",
+				false,
+				false,
+				"ui-corner-bottom"
+			]
+		};
+
+	$.each( tests, function( widget, html ) {
+		$.each( orientations, function( name, classes ) {
+			count += 41;
+			var i, control, currentClasses,
+				controls = [],
+				element = $( "
" ).controlgroup({
+					direction: name
+				}).appendTo( "body" );
+
+			for ( i = 0; i < 4; i++ ) {
+				control = $( html ).attr( "id", "id" + i )
+					.add( $( "" ).clone().attr( "for", "id" + i ) );
+
+				controls.push( control );
+				element.append( control );
+			}
+			element.controlgroup( "refresh" );
+			for ( i = 0; i < 4; i++ ) {
+				strictEqual( controls[ i ].is( ":ui-" + widget ), true,
+					name + ": " + widget + " " + i+ ": is a " + widget + " widget after refresh" );
+			}
+			checkCornerClasses( classes );
+			interateHidden( true );
+			element.controlgroup( "option", "excludeInvisible", false );
+			interateHidden();
+
+			controls[ 0 ].prop( "disabled", true );
+
+			element.controlgroup( "refresh" );
+
+			strictEqual( controls[ 0 ][ widget ]( "widget" ).hasClass( "ui-state-disabled" ), true,
+				"Checkbox has ui-state-disabled after adding disabled prop and refreshing control group" );
+
+			element.remove();
+			expect( count );
+			function showElement( index, value ) {
+				$( value )[ widget ]( "widget" ).show();
+			}
+			function interateHidden( excludeInvisible ) {
+				for ( i = 0; i < 4; i++ ) {
+					$.each( controls, showElement );
+					controls[ i ][ widget ]( "widget" ).hide();
+					currentClasses = classes.slice( 0 );
+					if ( excludeInvisible ) {
+						if ( i === 0 ) {
+							currentClasses[ i + 1 ] = classes[ i ];
+							currentClasses[ i ] = false;
+						} else if ( i === 3 ) {
+							currentClasses[ i - 1 ] = classes[ i ];
+							currentClasses[ i ] = false;
+						}
+					}
+					element.controlgroup( "refresh" );
+					checkCornerClasses( currentClasses );
+				}
+			}
+			function checkCornerClasses( classList ) {
+				for ( var j = 0; j < 4; j++ ) {
+					strictEqual( !!hasCornerClass( classList[ j ], controls[ j ][ widget ]( "widget" ) ), !!classList[ j ],
+						name + ": " + widget + " " + j + ": has class " + classList[ j ] + " after refresh" );
+				}
+			}
+		});
+	});
+});
\ No newline at end of file
diff --git a/tests/unit/controlgroup/controlgroup_options.js b/tests/unit/controlgroup/controlgroup_options.js
new file mode 100644
index 00000000000..aa99352c555
--- /dev/null
+++ b/tests/unit/controlgroup/controlgroup_options.js
@@ -0,0 +1,92 @@
+module( "Controlgroup: options" );
+
+function hasCornerClass( className, element ) {
+	if ( className ) {
+		return element.hasClass( className );
+	}
+
+	return element.attr( "class" ).match( /ui-corner/g );
+}
+
+test( "disabled", function() {
+	expect( 1 );
+	var tests = 2,
+		element = $( ".controlgroup" ).controlgroup().controlgroup( "option", "disabled", true );
+	strictEqual( element.hasClass( "ui-state-disabled" ), false,
+		"ui-state-disabled is present on widget after setting disabled true" );
+	$.each( $.ui.controlgroup.prototype.options.items, function( widget, selector ){
+		element.children( selector ).each(function(){
+			expect( ++tests );
+			strictEqual( $( this )[ widget ]( "widget" ).hasClass( "ui-state-disabled"), true,
+				"Child " + widget + " widgets are disabled" );
+		});
+	});
+	element.controlgroup( "option", "disabled", false );
+	strictEqual( element.hasClass( "ui-state-disabled" ), false,
+		"ui-state-disabled is not present on widget after setting disabled false" );
+	$.each( $.ui.controlgroup.prototype.options.items, function( widget, selector ){
+		element.children( selector ).each(function(){
+			expect( ++tests );
+			strictEqual( !$( this )[ widget ]( "widget" ).hasClass( "ui-state-disabled"), true,
+				"Child " + widget + " widgets are disabled" );
+		});
+	});
+});
+test( "items", function() {
+	var element = $( ".controlgroup" ).controlgroup({
+		items: {
+			"button": null,
+			"selectmenu": null,
+			"checkboxradio": null
+		}
+	});
+
+	strictEqual( element.children( ".ui-button" ).length, 0,
+		"Child widgets are not called when selector is null" );
+
+	element.controlgroup( "option", "items", {
+		"button": "button"
+	});
+	strictEqual( element.children( ".ui-button" ).length, 2,
+		"Correct child widgets are called when selector is updated" );
+	expect( 2 );
+});
+
+test( "excludeInvisible", function() {
+	var element = $( ".controlgroup" ).controlgroup(),
+		buttons = element.children( ".ui-button" );
+
+	expect( 4 );
+
+	strictEqual( !!hasCornerClass( false, buttons.eq( 0 ) ), false,
+		"ExcludeInvisible: true: Hidden first element does not get a corner class" );
+	strictEqual( buttons.eq( 1 ).hasClass( "ui-corner-left" ), true,
+		"ExcludeInvisible: true: First button is hidden second button get corner class" );
+	element.controlgroup( "option", "excludeInvisible", false );
+	strictEqual( !!hasCornerClass( false, buttons.eq( 1 ) ), false,
+		"ExcludeInvisible: false: Hidden first element get a corner class" );
+	strictEqual( buttons.eq( 0 ).hasClass( "ui-corner-left" ), true,
+		"ExcludeInvisible: false: First button hidden second button doesn't get a corner class" );
+});
+
+test( "direction", function() {
+	var element = $( ".controlgroup" ).controlgroup(),
+		buttons = element.children( ".ui-button" );
+
+	expect( 6 );
+
+	strictEqual( element.hasClass( "ui-controlgroup-horizontal" ), true,
+		"Controlgroup gets horizontal class by default" );
+	strictEqual( buttons.filter( ":visible" ).first().hasClass( "ui-corner-left" ), true,
+		"First visible element in horizontal controlgroup gets ui-corner-left" );
+	strictEqual( buttons.filter( ":visible" ).last().hasClass( "ui-corner-right" ), true,
+		"Last visible element in horizontal controlgroup gets ui-corner-right" );
+
+	element.controlgroup( "option", "direction", "vertical" );
+	strictEqual( element.hasClass( "ui-controlgroup-vertical" ), true,
+		"Controlgroup gets vertical class by default" );
+	strictEqual( buttons.filter( ":visible" ).first().hasClass( "ui-corner-top" ), true,
+		"First visible element in vertical controlgroup gets ui-corner-top" );
+	strictEqual( buttons.filter( ":visible" ).last().hasClass( "ui-corner-bottom" ), true,
+		"Last visible element in vertical controlgroup gets ui-corner-bottom" );
+});
diff --git a/themes/base/base.css b/themes/base/base.css
index be4508284a2..aa661e63bae 100644
--- a/themes/base/base.css
+++ b/themes/base/base.css
@@ -14,6 +14,7 @@
 @import url("autocomplete.css");
 @import url("button.css");
 @import url("checkboxradio.css");
+@import url("controlgroup.css");
 @import url("datepicker.css");
 @import url("dialog.css");
 @import url("draggable.css");
diff --git a/themes/base/button.css b/themes/base/button.css
index 64ef85f44c7..c65fe934be6 100644
--- a/themes/base/button.css
+++ b/themes/base/button.css
@@ -75,6 +75,7 @@ input.ui-button.ui-button-icon-only {
 .ui-button.ui-icon-bottom .ui-icon {
 	top: auto;
 	bottom: .05em;
+
 }
 
 .ui-button-icon-only .ui-icon {
@@ -105,6 +106,23 @@ input.ui-button.ui-button-icon-only {
 	padding: .4em 1em 1.1em 1em;
 }
 
+.ui-button.ui-icon-notext .ui-icon {
+	padding: 0;
+	width: 2.1em;
+	height: 2.1em;
+	text-indent: -9999px;
+	white-space: nowrap;
+
+}
+
+input.ui-button.ui-icon-notext .ui-icon {
+	width: auto;
+	height: auto;
+	text-indent: 0;
+	white-space: normal;
+	padding: .4em 1em;
+}
+
 /* workarounds */
 /* reset extra padding in Firefox, see h5bp.com/l */
 input.ui-button::-moz-focus-inner,
diff --git a/themes/base/controlgroup.css b/themes/base/controlgroup.css
new file mode 100644
index 00000000000..0aff19d5edd
--- /dev/null
+++ b/themes/base/controlgroup.css
@@ -0,0 +1,26 @@
+/*!
+ * jQuery UI Controlgroup @VERSION
+ * http://jqueryui.com
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/controlgroup/#theming
+ */
+
+
+.ui-controlgroup > .ui-button {
+	margin-left: -2px;
+	margin-right: -1px;
+}
+.ui-controlgroup.ui-controlgroup-vertical > .ui-button {
+	display: block;
+	width: 100%;
+	margin-top: -1px;
+	margin-bottom: -1px;
+	text-align: left;
+}
+.ui-controlgroup-vertical label.ui-button {
+	box-sizing: border-box;
+}
\ No newline at end of file
diff --git a/themes/base/core.css b/themes/base/core.css
index 05186d086f5..d0cd0359454 100644
--- a/themes/base/core.css
+++ b/themes/base/core.css
@@ -73,37 +73,11 @@
 	text-indent: -99999px;
 	overflow: hidden;
 	background-repeat: no-repeat;
-}
-
-.ui-icon {
 	left: .5em;
 	top: .3em;
 }
 
-.ui-icon-end .ui-icon {
-	left: auto;
-	right: .5em;
-}
-
-.ui-icon-top .ui-icon,
-.ui-icon-bottom .ui-icon {
-	left: 50%;
-	margin-left: -11px;
-}
 
-.ui-icon-top .ui-icon {
-	top: .6em;
-}
-
-.ui-icon-bottom .ui-icon {
-	top: auto;
-	bottom: .05em;
-}
-
-.ui-icon-notext .ui-icon {
-	left: 50%;
-	margin-left: -8px;
-}
 
 /* Misc visuals
 ----------------------------------*/
diff --git a/ui/controlgroup.js b/ui/controlgroup.js
new file mode 100644
index 00000000000..c0a3ab1589c
--- /dev/null
+++ b/ui/controlgroup.js
@@ -0,0 +1,143 @@
+/*!
+ * jQuery UI Controlgroup @VERSION
+ * http://jqueryui.com
+ *
+ * Copyright 2014 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/controlgroup/
+ */
+(function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define([
+			"jquery",
+			"./core",
+			"./widget"
+		], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+}(function( $ ) {
+
+$.widget( "ui.controlgroup", {
+	version: "@VERSION",
+	defaultElement: "
",
+	options: {
+		disabled: null,
+		items: {
+			"button": "input[type=button], input[type=submit], input[type=reset], button, a",
+			"checkboxradio": "input[type='checkbox'], input[type='radio']",
+			"selectmenu": "select"
+		},
+		direction: "horizontal",
+		excludeInvisible: true
+	},
+
+	_create: function() {
+		this._enhance();
+		this._on( this.element, {
+			"selectmenuopen": "_handleSelectmenuOpen",
+			"selectmenuclose": "_handleSelectmenuClose"
+		});
+	},
+
+	_handleSelectmenuOpen: function( event ) {
+		var target = $( event.target ),
+			widget = target.selectmenu ( "widget" ),
+			vertical = this.options.direction === "vertical";
+		if ( widget[ 0 ] !== this.first[ 0 ] || !vertical ) {
+			widget.removeClass( "ui-corner-top" );
+		}
+		if ( vertical && widget[ 0 ] === this.last[ 0 ] ) {
+			widget.removeClass( "ui-corner-bottom" );
+		}
+		if ( widget[ 0 ] === this.first[ 0 ] ) {
+			widget.removeClass( "ui-corner-left" )
+				.addClass( "ui-corner-" + ( vertical ? "top" : "tl" ) );
+		}
+		if ( widget[ 0 ] === this.last[ 0 ] ) {
+			widget.removeClass( "ui-corner-right" )
+				.addClass( vertical ? "" : "ui-corner-tr" );
+		}
+	},
+
+	_handleSelectmenuClose: function( event ) {
+		var target = $( event.target ),
+			widget = target.selectmenu ( "widget" ),
+			vertical = this.options.direction === "vertical";
+		widget.removeClass( "ui-corner-all" );
+		if ( widget[ 0 ] === this.first[ 0 ] ) {
+			widget.removeClass( "ui-corner-left" )
+				.addClass( "ui-corner-" + ( vertical ? "top" : "left" ) );
+		}
+		if ( widget[ 0 ] === this.last[ 0 ] ) {
+			widget.removeClass( "ui-corner-right" )
+				.addClass( vertical ? "ui-corner-bottom" : "ui-corner-right" );
+		}
+	},
+
+	_enhance: function() {
+		this.element.attr( "role", "toolbar" );
+		this.refresh();
+	},
+
+	_destroy: function() {
+		this._callChildMethod( "destroy" );
+		this.element.removeAttr( "role" );
+		this.element.removeClass( "ui-controlgroup ui-selectmenu-vertical ui-controlgroup-horizontal" )
+			.children().removeClass( "ui-corner-all ui-corner-top" +
+			" ui-corner-bottom ui-corner-left ui-corner-tl ui-corner-tr" );
+	},
+
+	_callChildMethod: function( method, filter ) {
+		var that = this;
+		$.each( this.options.items, function( widget, selector ) {
+			if ( $.fn[ widget ] && selector ) {
+				that.element.children( selector ).not( filter )[ widget ]( method );
+			}
+		});
+	},
+
+	_setOption: function( key, value ) {
+		var original = this.options[ key ];
+
+		this._super( key, value );
+		if ( key === "direction" ) {
+			this.element.removeClass( "ui-controlgroup-" + original )
+				.addClass( "ui-controlgroup-" + value );
+		}
+		if ( key === "disabled" ) {
+			this._callChildMethod( value ? "disable" : "enable" );
+		} else {
+			this.refresh();
+		}
+
+	},
+
+	refresh: function() {
+		var vertical = ( this.options.direction === "vertical" );
+		this.element.addClass( "ui-controlgroup ui-controlgroup-" + this.options.direction );
+		this._callChildMethod( undefined );
+		this.visible = this.element.children( ".ui-button" ).removeClass( function(index, css) {
+			return ( css.match( /ui-corner-[a-z]*/g ) || [] ).join( " " );
+		}).filter( this.options.excludeInvisible ? ":visible" : "*" );
+
+		this.first = this.visible.filter( ":first" )
+			.addClass( "ui-corner-" + ( vertical ? "top" : "left" ) );
+		this.last =	this.visible.filter( ":last" )
+			.addClass( "ui-corner-" + ( vertical ? "bottom" : "right" ) );
+		this.element.find( this.options.items.selectmenu ).selectmenu( "refresh" );
+		this._callChildMethod( "refresh" );
+
+	}
+
+});
+
+return $.ui.controlgroup;
+
+}));

From 35697d4eb9edb88dc2f5cbb14e7e65105945c08f Mon Sep 17 00:00:00 2001
From: Alexander Schmitz 
Date: Wed, 3 Sep 2014 10:12:17 -0400
Subject: [PATCH 69/73] Controlgroup: add classes option

---
 demos/controlgroup/default.html               |  12 +-
 demos/controlgroup/splitbutton.html           |   3 -
 demos/controlgroup/toolbar.html               |   5 +-
 tests/unit/controlgroup/controlgroup.html     |  43 ++++++
 .../unit/controlgroup/controlgroup_common.js  |   5 +
 .../unit/controlgroup/controlgroup_options.js |  33 +++++
 themes/base/controlgroup.css                  |   8 +-
 ui/controlgroup.js                            | 136 ++++++++++++------
 8 files changed, 184 insertions(+), 61 deletions(-)

diff --git a/demos/controlgroup/default.html b/demos/controlgroup/default.html
index 37090024285..75c8c89fc4f 100644
--- a/demos/controlgroup/default.html
+++ b/demos/controlgroup/default.html
@@ -20,10 +20,11 @@
 	
 	
 	
 
 
-

-
A Controlgroup creating a split button
-
 

 	
Split button
 	

diff --git a/demos/controlgroup/toolbar.html b/demos/controlgroup/toolbar.html
index ab02b83fb10..8f1e42bffef 100644
--- a/demos/controlgroup/toolbar.html
+++ b/demos/controlgroup/toolbar.html
@@ -113,7 +113,7 @@
 				30px
 				36px
 			
-			
+			
 				Highlight: None
 				Highlight: Red
 				Highlight: Yellow
@@ -124,7 +124,8 @@
 				Highlight: Orange
 			
 			
-				Font: None
+				Font: Black
+				Font: White
 				Font: Red
 				Font: Yellow
 				Font: Green
diff --git a/tests/unit/controlgroup/controlgroup.html b/tests/unit/controlgroup/controlgroup.html
index 5b97d5378ec..91e59d6779d 100644
--- a/tests/unit/controlgroup/controlgroup.html
+++ b/tests/unit/controlgroup/controlgroup.html
@@ -56,6 +56,49 @@
 			Slow
 		
 	
+	

+		Button with icon only
+		
+			Fast
+			Medium
+			Slow
+		
+		Checkbox
+		
+		
+			Fast
+			Medium
+			Slow
+		
+		Button with icon on the bottom
+		
+			Fast
+			Medium
+			Slow
+		
+