From 02033262ee0fb1d9f33c361b3c2ddfa168604854 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Wed, 22 Jan 2014 12:02:32 -0500
Subject: Button: Initial commit of button re-factor

Move to using element stats rather then js class states remove
ui-button-text spans.
Removed button set
---
 tests/unit/button/deprecated.js | 196 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 196 insertions(+)
 create mode 100644 tests/unit/button/deprecated.js

(limited to 'tests/unit/button/deprecated.js')

diff --git a/tests/unit/button/deprecated.js b/tests/unit/button/deprecated.js
new file mode 100644
index 000000000..bb023ab4f
--- /dev/null
+++ b/tests/unit/button/deprecated.js
@@ -0,0 +1,196 @@
+define( [
+	"jquery",
+	"ui/button"
+], function( $ ) {
+
+module( "Button (deprecated): core" );
+
+test( "Calling button on a checkbox input calls checkboxradio widget", function() {
+	var checkbox = $( "#checkbox01" );
+
+	expect( 2 );
+	checkbox.button();
+
+	ok( !!checkbox.checkboxradio( "instance" ),
+		"Calling button on a checkbox creates checkboxradio instance" );
+	ok( !checkbox.checkboxradio( "option", "icon" ),
+		"Calling button on a checkbox sets the checkboxradio icon option to false" );
+} );
+
+test( "Calling buttonset calls controlgroup", function() {
+	var controlgroup = $( ".buttonset" );
+
+	expect( 1 );
+	controlgroup.buttonset();
+
+	ok( controlgroup.is( ":ui-controlgroup" ), "Calling buttonset creates controlgroup instance" );
+} );
+
+module( "Button (deprecated): methods" );
+
+test( "destroy", function( assert ) {
+	expect( 1 );
+	assert.domEqual( "#checkbox02", function() {
+		$( "#checkbox02" ).button().button( "destroy" );
+	} );
+} );
+
+test( "refresh: Ensure disabled state is preserved correctly.", function() {
+	expect( 5 );
+	var element = null;
+
+	element = $( "#checkbox02" );
+	element.button( { disabled: true } ).button( "refresh" );
+	ok( element.button( "option", "disabled" ), "Checkboxes should remain disabled after refresh" );
+	ok( element.prop( "disabled" ), "Input remains disabled after refresh" );
+
+	element = $( "#radio02" );
+	element.button( { disabled: true } ).button( "refresh" );
+	ok( element.button( "option", "disabled" ), "Radio buttons should remain disabled after refresh" );
+
+	element = $( "#checkbox02" );
+	element.button( { disabled: true } ).prop( "disabled", false ).button( "refresh" );
+	ok( !element.button( "option", "disabled" ), "Changing a checkbox's disabled property should update the state after refresh." );
+
+	element = $( "#radio02" );
+	element.button( { disabled: true } ).prop( "disabled", false ).button( "refresh" );
+	ok( !element.button( "option", "disabled" ), "Changing a radio button's disabled property should update the state after refresh." );
+
+} );
+
+module( "button (deprecated): options" );
+
+test( "Setting items option on buttonset sets the button properties on the items option", function() {
+	expect( 2 );
+
+	var controlgroup = $( ".buttonset" );
+
+	controlgroup.buttonset( { items: "bar" } );
+	equal( controlgroup.controlgroup( "option", "items.button" ), "bar",
+		"items.button set when setting items option on init on buttonset" );
+
+	controlgroup.buttonset( "option", "items", "foo" );
+	equal( controlgroup.controlgroup( "option", "items.button" ), "foo",
+		"items.button set when setting items option on buttonset" );
+} );
+
+test( "disabled, null", function() {
+	expect( 2 );
+
+	$( "#radio02" ).prop( "disabled", true ).button( { disabled: null } );
+	deepEqual( $( "#radio02" ).button( "option", "disabled" ), true,
+		"disabled option set to true" );
+	deepEqual( true, $( "#radio02" ).prop( "disabled" ), "element is not disabled" );
+} );
+
+test( "text / showLabel options proxied", function() {
+	expect( 8 );
+	var button = $( "#button" );
+	button.button( {
+		text: false,
+		icon: "ui-icon-gear"
+	} );
+	equal( button.button( "option", "showLabel" ), false,
+		"Setting the text option to false sets the showLabel option to false on init" );
+	button.button( "option", "showLabel", true );
+	equal( button.button( "option", "text" ), true,
+		"Setting showLabel true with option method sets text option to true" );
+	button.button( "option", "text", false );
+	equal( button.button( "option", "showLabel" ), false,
+		"Setting text false with option method sets showLabel option to false" );
+	button.button( "option", "text", true );
+	equal( button.button( "option", "showLabel" ), true,
+		"Setting text true with option method sets showLabel option to true" );
+	button.button( "option", "showLabel", false );
+	equal( button.button( "option", "text" ), false,
+		"Setting showLabel false with option method sets text option to false" );
+	button.button( "destroy" );
+	button.button( {
+		text: true,
+		icon: "ui-icon-gear"
+	} );
+	equal( button.button( "option", "showLabel" ), true,
+		"Setting the text option to true sets the showLabel option to true on init" );
+	button.button( "destroy" );
+	button.button( {
+		showLabel: true,
+		icon: "ui-icon-gear"
+	} );
+	equal( button.button( "option", "text" ), true,
+		"Setting the showLabel option to true sets the text option to true on init" );
+	button.button( "destroy" );
+	button.button( {
+		showLabel: false,
+		icon: "ui-icon-gear"
+	} );
+	equal( button.button( "option", "text" ), false,
+		"Setting the showLabel option to false sets the text option to false on init" );
+} );
+
+test( "icon / icons options properly proxied", function() {
+	expect( 10 );
+
+	var button = $( "#button" );
+
+	button.button( {
+		icon: "foo"
+	} );
+
+	equal( button.button( "option", "icons.primary" ), "foo",
+		"Icon option properly proxied on init" );
+
+	button.button( {
+		icon: "bar"
+	} );
+
+	equal( button.button( "option", "icons.primary" ), "bar",
+		"Icon option properly proxied with option method" );
+
+	button.button( {
+		icons: {
+			primary: "foo"
+		}
+	} );
+
+	equal( button.button( "option", "icon" ), "foo",
+		"Icons primary option properly proxied with option method" );
+	equal( button.button( "option", "iconPosition" ), "beginning",
+		"Icons primary option sets iconPosition option to beginning" );
+
+	button.button( {
+		icons: {
+			secondary: "bar"
+		}
+	} );
+
+	equal( button.button( "option", "icon" ), "bar",
+		"Icons secondary option properly proxied with option method" );
+	equal( button.button( "option", "iconPosition" ), "end",
+		"Icons secondary option sets iconPosition option to end" );
+
+	button.button( "destroy" );
+
+	button.button( {
+		icons: {
+			primary: "foo"
+		}
+	} );
+
+	equal( button.button( "option", "icon" ), "foo",
+		"Icons primary option properly proxied on init" );
+	equal( button.button( "option", "iconPosition" ), "beginning",
+		"Icons primary option sets iconPosition option to beginning on init" );
+
+	button.button( {
+		icons: {
+			secondary: "bar"
+		}
+	} );
+
+	equal( button.button( "option", "icon" ), "bar",
+		"Icons secondary option properly proxied on init" );
+	equal( button.button( "option", "iconPosition" ), "end",
+		"Icons secondary option sets iconPosition option to end on init" );
+} );
+
+} );
-- 
cgit v1.2.3


From 16abde399daa07e11f3b972ab675d59374cf08be Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Wed, 7 Jan 2015 21:51:38 -0500
Subject: Spinner: Updates for new button widget and classes option

---
 demos/button/default.html                 |   9 +-
 demos/button/icons.html                   |  10 +-
 demos/button/splitbutton.html             |  70 --------
 demos/button/toolbar.html                 | 115 ------------
 demos/checkboxradio/default.html          |   9 +-
 demos/checkboxradio/no-icons.html         |   9 +-
 demos/checkboxradio/product-selector.html |  10 +-
 demos/checkboxradio/radiogroup.html       |  10 +-
 tests/unit/button/common-deprecated.js    |   2 +-
 tests/unit/button/core.js                 |   1 +
 tests/unit/button/deprecated.js           |   2 +-
 tests/unit/checkboxradio/common.js        |   2 +-
 tests/unit/checkboxradio/core.js          |   2 +-
 tests/unit/checkboxradio/events.js        |  72 +-------
 tests/unit/checkboxradio/methods.js       |   2 +-
 tests/unit/checkboxradio/options.js       |   2 +-
 ui/checkboxradio.js                       | 289 ------------------------------
 ui/widgets/button.js                      |   3 +-
 ui/widgets/checkboxradio.js               | 265 +++++++++++++++++++++++++++
 ui/widgets/spinner.js                     |  12 +-
 20 files changed, 293 insertions(+), 603 deletions(-)
 delete mode 100644 demos/button/splitbutton.html
 delete mode 100644 demos/button/toolbar.html
 delete mode 100644 ui/checkboxradio.js
 create mode 100644 ui/widgets/checkboxradio.js

(limited to 'tests/unit/button/deprecated.js')

diff --git a/demos/button/default.html b/demos/button/default.html
index 5418fd8c9..644dcd225 100644
--- a/demos/button/default.html
+++ b/demos/button/default.html
@@ -5,18 +5,13 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>jQuery UI Button - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/button.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<script>
-	$( function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js">
 		$( ".widget input[type=submit], .widget a, .widget button" ).button();
 		$( "button, input, a" ).click( function( event ) {
 			event.preventDefault();
 		} );
-	} );
 	</script>
 </head>
 <body>
diff --git a/demos/button/icons.html b/demos/button/icons.html
index a8deca9cd..af4e3000c 100644
--- a/demos/button/icons.html
+++ b/demos/button/icons.html
@@ -5,13 +5,9 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>jQuery UI Button - Icons</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/button.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<script>
-	$( function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js">
 		$( ".widget button" ).first()
 			.button()
 			.next().button( {
@@ -29,7 +25,6 @@
 				icon: "ui-icon-gear",
 				iconPosition: "bottom"
 			} );
-	} );
 	</script>
 </head>
 <body>
@@ -41,7 +36,6 @@
 	<button>Button with icon on the right</button>
 	<button>Button with icon on the top</button>
 	<button>Button with icon on the bottom</button>
-	<button>Button with icon on the top</button>
 </div>
 <div class="css">
 	<h1>CSS</h1>
diff --git a/demos/button/splitbutton.html b/demos/button/splitbutton.html
deleted file mode 100644
index 6b7562d68..000000000
--- a/demos/button/splitbutton.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>jQuery UI Button - Split button</title>
-	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/button.js"></script>
-	<script src="../../ui/position.js"></script>
-	<script src="../../ui/menu.js"></script>
-	<link rel="stylesheet" href="../demos.css">
-	<style>
-		.ui-menu { position: absolute; width: 100px; }
-	</style>
-	<script>
-	$(function() {
-		$( "#rerun" )
-			.button()
-			.on( "click", function() {
-				alert( "Running the last action" );
-			})
-			.next()
-				.button({
-					text: false,
-					icons: {
-						primary: "ui-icon-triangle-1-s"
-					}
-				})
-				.on( "click", function() {
-					var menu = $( this ).parent().next().show().position({
-						my: "left top",
-						at: "left bottom",
-						of: this
-					});
-					$( document ).one( "click", function() {
-						menu.hide();
-					});
-					return false;
-				})
-				.parent()
-					.buttonset()
-					.next()
-						.hide()
-						.menu();
-	});
-	</script>
-</head>
-<body>
-
-<div>
-	<div>
-		<button id="rerun">Run last action</button>
-		<button id="select">Select an action</button>
-	</div>
-	<ul>
-		<li><div>Open...</div></li>
-		<li><div>Save</div></li>
-		<li><div>Delete</div></li>
-	</ul>
-</div>
-
-<div class="demo-description">
-<p>An example of a split button built with two buttons: A plain button with just text, one with only a primary icon
-and no text. Both are grouped together in a set.</p>
-</div>
-</body>
-</html>
diff --git a/demos/button/toolbar.html b/demos/button/toolbar.html
deleted file mode 100644
index f2c242f1f..000000000
--- a/demos/button/toolbar.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>jQuery UI Button - Toolbar</title>
-	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/button.js"></script>
-	<link rel="stylesheet" href="../demos.css">
-	<style>
-	#toolbar {
-		padding: 4px;
-		display: inline-block;
-	}
-	</style>
-	<script>
-	$(function() {
-		$( "#beginning" ).button({
-			text: false,
-			icons: {
-				primary: "ui-icon-seek-start"
-			}
-		});
-		$( "#rewind" ).button({
-			text: false,
-			icons: {
-				primary: "ui-icon-seek-prev"
-			}
-		});
-		$( "#play" ).button({
-			text: false,
-			icons: {
-				primary: "ui-icon-play"
-			}
-		})
-		.on( "click", function() {
-			var options;
-			if ( $( this ).text() === "play" ) {
-				options = {
-					label: "pause",
-					icons: {
-						primary: "ui-icon-pause"
-					}
-				};
-			} else {
-				options = {
-					label: "play",
-					icons: {
-						primary: "ui-icon-play"
-					}
-				};
-			}
-			$( this ).button( "option", options );
-		});
-		$( "#stop" ).button({
-			text: false,
-			icons: {
-				primary: "ui-icon-stop"
-			}
-		})
-		.on( "click", function() {
-			$( "#play" ).button( "option", {
-				label: "play",
-				icons: {
-					primary: "ui-icon-play"
-				}
-			});
-		});
-		$( "#forward" ).button({
-			text: false,
-			icons: {
-				primary: "ui-icon-seek-next"
-			}
-		});
-		$( "#end" ).button({
-			text: false,
-			icons: {
-				primary: "ui-icon-seek-end"
-			}
-		});
-		$( "#shuffle" ).button();
-		$( "#repeat" ).buttonset();
-	});
-	</script>
-</head>
-<body>
-
-<div id="toolbar" class="ui-widget-header ui-corner-all">
-	<button id="beginning">go to beginning</button>
-	<button id="rewind">rewind</button>
-	<button id="play">play</button>
-	<button id="stop">stop</button>
-	<button id="forward">fast forward</button>
-	<button id="end">go to end</button>
-
-	<input type="checkbox" id="shuffle" /><label for="shuffle">Shuffle</label>
-
-	<span id="repeat">
-		<input type="radio" id="repeat0" name="repeat" checked="checked" /><label for="repeat0">No Repeat</label>
-		<input type="radio" id="repeat1" name="repeat" /><label for="repeat1">Once</label>
-		<input type="radio" id="repeatall" name="repeat" /><label for="repeatall">All</label>
-	</span>
-</div>
-
-<div class="demo-description">
-<p>
-	A mediaplayer toolbar. Take a look at the underlying markup: A few button elements,
-	an input of type checkbox for the Shuffle button, and three inputs of type radio for the Repeat options.
-</p>
-</div>
-</body>
-</html>
diff --git a/demos/checkboxradio/default.html b/demos/checkboxradio/default.html
index c8f4c5566..c8c1a800d 100644
--- a/demos/checkboxradio/default.html
+++ b/demos/checkboxradio/default.html
@@ -4,17 +4,12 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Checkboxradio - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/checkboxradio.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<script>
-	$(function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js">
 		$( "input" ).checkboxradio({
 			label: "foo"
 		});
-	});
 	</script>
 </head>
 <body>
diff --git a/demos/checkboxradio/no-icons.html b/demos/checkboxradio/no-icons.html
index 64b511246..c738d8ca8 100644
--- a/demos/checkboxradio/no-icons.html
+++ b/demos/checkboxradio/no-icons.html
@@ -4,17 +4,12 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Checkboxradio - No Icons</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/checkboxradio.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<script>
-	$(function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js">
 		$( "input" ).checkboxradio({
 			icon: false
 		});
-	});
 	</script>
 </head>
 <body>
diff --git a/demos/checkboxradio/product-selector.html b/demos/checkboxradio/product-selector.html
index f8da07118..4e6db4507 100644
--- a/demos/checkboxradio/product-selector.html
+++ b/demos/checkboxradio/product-selector.html
@@ -4,14 +4,9 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Checkboxradio - Product Selector</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/checkboxradio.js"></script>
-	<script src="../../ui/controlgroup.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<script>
-	$(function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js">
 		$( "input" ).checkboxradio();
 		$( "[name='shape']").on( "change", function(){
 			$( ".shape" ).removeClass( "circle pill square rectangle" )
@@ -34,7 +29,6 @@
 		$( ".toggles" ).controlgroup({
 			direction: "vertical"
 		});
-	});
 	</script>
 	<style>
 		.shape {
diff --git a/demos/checkboxradio/radiogroup.html b/demos/checkboxradio/radiogroup.html
index b307db82d..bfca290b0 100644
--- a/demos/checkboxradio/radiogroup.html
+++ b/demos/checkboxradio/radiogroup.html
@@ -4,17 +4,11 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Checkboxradio - Radio Group</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/checkboxradio.js"></script>
-	<script src="../../ui/controlgroup.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<script>
-	$(function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js">
 		$( "input" ).checkboxradio();
 		$( "fieldset" ).controlgroup();
-	});
 	</script>
 </head>
 <body>
diff --git a/tests/unit/button/common-deprecated.js b/tests/unit/button/common-deprecated.js
index 1441d3a8a..0f03bdba2 100644
--- a/tests/unit/button/common-deprecated.js
+++ b/tests/unit/button/common-deprecated.js
@@ -1,6 +1,6 @@
 define( [
 	"lib/common",
-	"ui/button"
+	"ui/widgets/button"
 ], function( common ) {
 
 common.testWidget( "button", {
diff --git a/tests/unit/button/core.js b/tests/unit/button/core.js
index a7c164a33..de26b0312 100644
--- a/tests/unit/button/core.js
+++ b/tests/unit/button/core.js
@@ -1,5 +1,6 @@
 define( [
 	"jquery",
+	"ui/safe-active-element",
 	"ui/widgets/button"
 ], function( $ ) {
 
diff --git a/tests/unit/button/deprecated.js b/tests/unit/button/deprecated.js
index bb023ab4f..fac02e2a6 100644
--- a/tests/unit/button/deprecated.js
+++ b/tests/unit/button/deprecated.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"ui/button"
+	"ui/widgets/button"
 ], function( $ ) {
 
 module( "Button (deprecated): core" );
diff --git a/tests/unit/checkboxradio/common.js b/tests/unit/checkboxradio/common.js
index 6a739435f..0dd663d07 100644
--- a/tests/unit/checkboxradio/common.js
+++ b/tests/unit/checkboxradio/common.js
@@ -1,6 +1,6 @@
 define( [
 	"lib/common",
-	"ui/checkboxradio"
+	"ui/widgets/checkboxradio"
 ], function( common ) {
 
 common.testWidget( "checkboxradio", {
diff --git a/tests/unit/checkboxradio/core.js b/tests/unit/checkboxradio/core.js
index e70ca58c1..70ed4bb69 100644
--- a/tests/unit/checkboxradio/core.js
+++ b/tests/unit/checkboxradio/core.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"ui/checkboxradio"
+	"ui/widgets/checkboxradio"
 ], function( $ ) {
 
 module( "Checkboxradio: core" );
diff --git a/tests/unit/checkboxradio/events.js b/tests/unit/checkboxradio/events.js
index e5909a386..ad7f1e75f 100644
--- a/tests/unit/checkboxradio/events.js
+++ b/tests/unit/checkboxradio/events.js
@@ -1,80 +1,10 @@
 define( [
 	"jquery",
-	"ui/checkboxradio"
+	"ui/widgets/checkboxradio"
 ], function( $ ) {
 
 module( "Checkboxradio: events" );
 
-asyncTest( "form reset / click", function( assert ) {
-	expect( 35 );
-
-	var radios = [
-			$( "#radio11" ).checkboxradio(),
-			$( "#radio12" ).checkboxradio(),
-			$( "#radio13" ).checkboxradio()
-		],
-		widgets = [
-			radios[ 0 ].checkboxradio( "widget" ),
-			radios[ 1 ].checkboxradio( "widget" ),
-			radios[ 2 ].checkboxradio( "widget" )
-		],
-		form1 = $( "#form1" ),
-		form2 = $( "#form2" );
-
-	// Checkes that only the specified radio is checked in the group
-	function assertChecked( checked ) {
-		$.each( widgets, function( index ) {
-			var method = index === checked ? "hasClasses" : "lacksClasses";
-
-			assert[ method ]( widgets[ index ], "ui-checkboxradio-checked ui-state-active" );
-		} );
-	}
-
-	// Checks the form count on each form
-	function assertFormCount( count ) {
-		equal( form1.data( "uiCheckboxradioCount" ), count, "Form1 has a count of " + count );
-		equal( form2.data( "uiCheckboxradioCount" ), 3, "Form2 has a count of 3" );
-	}
-
-	// Run the tests
-	function testForms( current, start ) {
-		assertChecked( 2 );
-
-		if ( !start && current !== 0 ) {
-			radios[ current - 1 ].checkboxradio( "destroy" );
-		}
-
-		assertFormCount( 3 - current );
-
-		radios[ current ].prop( "checked", true );
-		radios[ current ].trigger( "change" );
-		assertChecked( current );
-
-		form1.trigger( "reset" );
-	}
-
-	// Recoursivly run the tests in a setTimeout with call back for the resets
-	function iterate( i ) {
-		setTimeout( function() {
-			if ( i < 3 ) {
-				testForms( i );
-				iterate( i + 1 );
-				return;
-			}
-			radios[ 2 ].checkboxradio( "destroy" );
-			assertChecked( false );
-			start();
-		} );
-	}
-
-	$( "#form2 input" ).checkboxradio();
-
-	// Check the starting state then kick everything off
-	testForms( 0, true );
-	iterate( 0 );
-
-} );
-
 asyncTest(
 	"Resetting a checkbox's form should refresh the visual state of the checkbox",
 	function( assert ) {
diff --git a/tests/unit/checkboxradio/methods.js b/tests/unit/checkboxradio/methods.js
index f189c9eea..c0ce9fde6 100644
--- a/tests/unit/checkboxradio/methods.js
+++ b/tests/unit/checkboxradio/methods.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"ui/checkboxradio"
+	"ui/widgets/checkboxradio"
 ], function( $ ) {
 
 module( "Checkboxradio: methods" );
diff --git a/tests/unit/checkboxradio/options.js b/tests/unit/checkboxradio/options.js
index 11bd072ca..1998ff54e 100644
--- a/tests/unit/checkboxradio/options.js
+++ b/tests/unit/checkboxradio/options.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"ui/checkboxradio"
+	"ui/widgets/checkboxradio"
 ], function( $ ) {
 
 module( "Checkboxradio: options" );
diff --git a/ui/checkboxradio.js b/ui/checkboxradio.js
deleted file mode 100644
index 84f69afaa..000000000
--- a/ui/checkboxradio.js
+++ /dev/null
@@ -1,289 +0,0 @@
-/*!
- * jQuery UI Checkboxradio @VERSION
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/checkboxradio/
- */
-( 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( $ ) {
-
-// Remove and replace with reset handler extension
-var formResetHandler = function() {
-		var form = $( this );
-
-		// Wait for the form reset to actually happen before refreshing
-		setTimeout( function() {
-
-			// We dont filter for css only versions since css only is not supported
-			form.find( ".ui-checkboxradio" ).checkboxradio( "refresh" );
-		} );
-	};
-
-$.widget( "ui.checkboxradio", {
-	version: "@VERSION",
-	options: {
-		disabled: null,
-		label: null,
-		icon: true,
-		classes: {
-			"ui-checkboxradio-label": "ui-corner-all",
-			"ui-checkboxradio-icon": "ui-corner-all"
-		}
-	},
-
-	_getCreateOptions: function() {
-		var disabled, labels,
-			that = this,
-			options = this._super() || {};
-
-		// We read the type here, because it makes more sense to throw a element type error first,
-		// rather then the error for lack of a label. Often if its the wrong type, it
-		// won't have a label (e.g. calling on a div, btn, etc)
-		this._readType();
-
-		labels = this.element.labels();
-
-		// Todo: For now we will use the last label we need to check about the best
-		// way to handle multiple labels with some accessability experts
-		this.label = $( labels[ labels.length - 1 ] );
-		if ( !this.label.length ) {
-			$.error( "No label found for checkboxradio widget" );
-		}
-
-		this.originalLabel = "";
-
-		// We need to get the label text but this may also need to make sure it does not contain the
-		// input itself.
-		this.label.contents().not( this.element ).each( function() {
-
-			// The label contents could be text html or a mix we concat each element to get a string
-			// representation of the label without the input as part of it.
-			that.originalLabel += this.nodeType === 3 ? $( this ).text() : this.outerHTML;
-		} );
-
-		// Set the label option if we found label text
-		if ( this.originalLabel ) {
-			options.label = this.originalLabel;
-		}
-
-		disabled = this.element[ 0 ].disabled;
-		if ( disabled != null ) {
-			options.disabled = disabled;
-		}
-		return options;
-	},
-
-	_create: function() {
-		var formCount,
-			checked = this.element[ 0 ].checked,
-			form = this.element.form();
-		this.formParent = !!form.length ? form : $( "body" );
-
-		formCount = this.formParent.data( "uiCheckboxradioCount" ) || 0;
-
-		// We don't use _on and _off here because we want all the checkboxes in the same form to use
-		// single handler which handles all the checkboxradio widgets in the form
-		if ( formCount === 0 ) {
-			this.formParent.on( "reset." + this.widgetFullName, formResetHandler );
-		}
-
-		this.formParent.data( "uiCheckboxradioCount", formCount + 1 );
-
-		if ( this.options.disabled == null ) {
-			this.options.disabled = this.element[ 0 ].disabled || false;
-		}
-
-		this._setOption( "disabled", this.options.disabled );
-		this._addClass( "ui-checkboxradio", "ui-helper-hidden-accessible" );
-		this._addClass( this.label, "ui-checkboxradio-label", "ui-button ui-widget" );
-
-		if ( this.type === "radio" ) {
-			this._addClass( this.label, "ui-checkboxradio-radio-label" );
-		}
-
-		if ( this.options.label && this.options.label !== this.originalLabel ) {
-			this._updateLabel();
-		} else if ( this.originalLabel ) {
-			this.options.label = this.originalLabel;
-		}
-
-		this._enhance();
-
-		if ( checked ) {
-			this._addClass( this.label, "ui-checkboxradio-checked", "ui-state-active" );
-			this._addClass( this.icon, null, "ui-state-hover" );
-		}
-
-		this._on( {
-			"change": "_toggleClasses",
-			"focus": function() {
-				this._addClass( this.label, null, "ui-state-focus ui-visual-focus" );
-			},
-			"blur": function() {
-				this._removeClass( this.label, null, "ui-state-focus ui-visual-focus" );
-			}
-		} );
-	},
-
-	_readType: function() {
-		var nodeName = this.element[ 0 ].nodeName.toLowerCase();
-		this.type = this.element[ 0 ].type;
-		if ( nodeName !== "input" || !/radio|checkbox/.test( this.type ) ) {
-			$.error( "Can't create checkboxradio on element.nodeName=" + nodeName +
-				" and element.type=" + this.type );
-		}
-	},
-
-	// Support jQuery Mobile enhanced option
-	_enhance: function() {
-		this._updateIcon( this.element[ 0 ].checked );
-	},
-
-	widget: function() {
-		return this.label;
-	},
-
-	_getRadioGroup: function() {
-		var name = this.element[ 0 ].name,
-			that = this,
-			radios = $( [] );
-
-		if ( name ) {
-			name = $.ui.escapeSelector( name );
-			radios = this.formParent.find( "[name='" + $.ui.escapeSelector( name ) + "']" ).filter( function() {
-				var form = $( this ).form();
-				return ( form.length ? form : $( "body" ) )[ 0 ] === that.formParent[ 0 ];
-			} );
-		}
-		return radios.not( this.element );
-	},
-
-	_toggleClasses: function() {
-		var checked = this.element[ 0 ].checked;
-		this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
-
-		if ( this.options.icon && this.type === "checkbox" ) {
-
-			// We add ui-state-highlight to change the icon color
-			this._toggleClass( this.icon, null, "ui-icon-check ui-state-highlight", checked )
-				._toggleClass( this.icon, null, "ui-icon-blank", !checked );
-		}
-		if ( this.type === "radio" ) {
-			this._getRadioGroup()
-				.each( function() {
-					var instance = $( this ).checkboxradio( "instance" );
-
-					if ( instance ) {
-						instance._removeClass( instance.label,
-							"ui-checkboxradio-checked", "ui-state-active" );
-					}
-				} );
-		}
-	},
-
-	_destroy: function() {
-		var formCount = this.formParent.data( "uiCheckboxradioCount" ) - 1;
-
-		this.formParent.data( "uiCheckboxradioCount", formCount );
-
-		if ( formCount === 0 ) {
-			this.formParent.off( "reset." + this.widgetFullName, formResetHandler );
-		}
-
-		if ( this.icon ) {
-			this.icon.remove();
-			this.iconSpace.remove();
-		}
-	},
-
-	_setOption: function( key, value ) {
-
-		// We don't alow the value to be set to nothing
-		if ( key === "label" && !value ) {
-			return;
-		}
-
-		this._super( key, value );
-
-		if ( key === "disabled" ) {
-			this._toggleClass( this.label, null, "ui-state-disabled", value );
-			this.element[ 0 ].disabled = value;
-
-			// Don't refresh if disabled
-			return;
-		}
-		this.refresh();
-	},
-
-	_updateIcon: function( checked ) {
-		var toAdd = "ui-icon ui-icon-background ";
-
-		if ( this.options.icon ) {
-			if ( !this.icon ) {
-				this.icon = $( "<span>" );
-				this.iconSpace = $( "<span> </span>" );
-				this._addClass( this.iconSpace, "ui-checkboxradio-icon-space" );
-			}
-
-			if ( this.type === "checkbox" ) {
-				toAdd += checked ? "ui-icon-check" : "ui-icon-blank";
-				this._removeClass( this.icon, null, checked ? "ui-icon-blank" : "ui-icon-check" );
-			} else {
-				toAdd += "ui-icon-blank";
-			}
-			this._addClass( this.icon, "ui-checkboxradio-icon", toAdd );
-			if ( !checked ) {
-				this._removeClass( this.icon, null, "ui-icon-check" );
-			}
-			this.icon.prependTo( this.label ).after( this.iconSpace );
-		} else if ( this.icon !== undefined ) {
-			this.icon.remove();
-			this.iconSpace.remove();
-			delete this.icon;
-		}
-	},
-
-	_updateLabel: function() {
-
-		// Remove the contents of the label ( minus the icon, icon space, and input )
-		this.label.contents().not( this.element.add( this.icon ).add( this.iconSpace ) ).remove();
-		this.label.append( this.options.label );
-	},
-
-	refresh: function() {
-		var checked = this.element[ 0 ].checked,
-			isDisabled = this.element[ 0 ].disabled;
-
-		this._updateIcon( checked );
-		this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
-		if ( this.options.label !== null ) {
-			this._updateLabel();
-		}
-
-		if ( isDisabled !== this.options.disabled ) {
-			this._setOptions( { "disabled": isDisabled } );
-		}
-	}
-
-} );
-
-return $.ui.checkboxradio;
-
-} ) );
diff --git a/ui/widgets/button.js b/ui/widgets/button.js
index 34a2afa40..2e6cc1f3c 100644
--- a/ui/widgets/button.js
+++ b/ui/widgets/button.js
@@ -12,8 +12,7 @@
 //>>description: Enhances a form with themeable buttons.
 //>>docs: http://api.jqueryui.com/button/
 //>>demos: http://jqueryui.com/button/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/button.css
+//>>css.structure: ../themes/base/core.css, ../themes/base/button.css
 //>>css.theme: ../themes/base/theme.css
 
 ( function( factory ) {
diff --git a/ui/widgets/checkboxradio.js b/ui/widgets/checkboxradio.js
new file mode 100644
index 000000000..781274b9b
--- /dev/null
+++ b/ui/widgets/checkboxradio.js
@@ -0,0 +1,265 @@
+/*!
+ * jQuery UI Checkboxradio @VERSION
+ * http://jqueryui.com
+ *
+ * Copyright 2014 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/checkboxradio/
+ */
+( function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [
+			"jquery",
+			"../escape-selector",
+			"../form-reset-mixin",
+			"../labels",
+			"../widget"
+		], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+}( function( $ ) {
+
+$.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
+	version: "@VERSION",
+	options: {
+		disabled: null,
+		label: null,
+		icon: true,
+		classes: {
+			"ui-checkboxradio-label": "ui-corner-all",
+			"ui-checkboxradio-icon": "ui-corner-all"
+		}
+	},
+
+	_getCreateOptions: function() {
+		var disabled, labels,
+			that = this,
+			options = this._super() || {};
+
+		// We read the type here, because it makes more sense to throw a element type error first,
+		// rather then the error for lack of a label. Often if its the wrong type, it
+		// won't have a label (e.g. calling on a div, btn, etc)
+		this._readType();
+
+		labels = this.element.labels();
+
+		// Todo: For now we will use the last label we need to check about the best
+		// way to handle multiple labels with some accessability experts
+		this.label = $( labels[ labels.length - 1 ] );
+		if ( !this.label.length ) {
+			$.error( "No label found for checkboxradio widget" );
+		}
+
+		this.originalLabel = "";
+
+		// We need to get the label text but this may also need to make sure it does not contain the
+		// input itself.
+		this.label.contents().not( this.element ).each( function() {
+
+			// The label contents could be text html or a mix we concat each element to get a string
+			// representation of the label without the input as part of it.
+			that.originalLabel += this.nodeType === 3 ? $( this ).text() : this.outerHTML;
+		} );
+
+		// Set the label option if we found label text
+		if ( this.originalLabel ) {
+			options.label = this.originalLabel;
+		}
+
+		disabled = this.element[ 0 ].disabled;
+		if ( disabled != null ) {
+			options.disabled = disabled;
+		}
+		return options;
+	},
+
+	_create: function() {
+		var checked = this.element[ 0 ].checked;
+
+		this._bindFormResetHandler();
+
+		// this.form is set by the form-reset-mixin
+		this.formParent = this.form.length ? this.form : $( "body" );
+
+		if ( this.options.disabled == null ) {
+			this.options.disabled = this.element[ 0 ].disabled || false;
+		}
+
+		this._setOption( "disabled", this.options.disabled );
+		this._addClass( "ui-checkboxradio", "ui-helper-hidden-accessible" );
+		this._addClass( this.label, "ui-checkboxradio-label", "ui-button ui-widget" );
+
+		if ( this.type === "radio" ) {
+			this._addClass( this.label, "ui-checkboxradio-radio-label" );
+		}
+
+		if ( this.options.label && this.options.label !== this.originalLabel ) {
+			this._updateLabel();
+		} else if ( this.originalLabel ) {
+			this.options.label = this.originalLabel;
+		}
+
+		this._enhance();
+
+		if ( checked ) {
+			this._addClass( this.label, "ui-checkboxradio-checked", "ui-state-active" );
+			this._addClass( this.icon, null, "ui-state-hover" );
+		}
+
+		this._on( {
+			"change": "_toggleClasses",
+			"focus": function() {
+				this._addClass( this.label, null, "ui-state-focus ui-visual-focus" );
+			},
+			"blur": function() {
+				this._removeClass( this.label, null, "ui-state-focus ui-visual-focus" );
+			}
+		} );
+	},
+
+	_readType: function() {
+		var nodeName = this.element[ 0 ].nodeName.toLowerCase();
+		this.type = this.element[ 0 ].type;
+		if ( nodeName !== "input" || !/radio|checkbox/.test( this.type ) ) {
+			$.error( "Can't create checkboxradio on element.nodeName=" + nodeName +
+				" and element.type=" + this.type );
+		}
+	},
+
+	// Support jQuery Mobile enhanced option
+	_enhance: function() {
+		this._updateIcon( this.element[ 0 ].checked );
+	},
+
+	widget: function() {
+		return this.label;
+	},
+
+	_getRadioGroup: function() {
+		var name = this.element[ 0 ].name,
+			that = this,
+			radios = $( [] );
+
+		if ( name ) {
+			name = $.ui.escapeSelector( name );
+			radios = this.formParent.find( "[name='" + $.ui.escapeSelector( name ) + "']" ).filter( function() {
+				var form = $( this ).form();
+				return ( form.length ? form : $( "body" ) )[ 0 ] === that.formParent[ 0 ];
+			} );
+		}
+		return radios.not( this.element );
+	},
+
+	_toggleClasses: function() {
+		var checked = this.element[ 0 ].checked;
+		this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
+
+		if ( this.options.icon && this.type === "checkbox" ) {
+
+			// We add ui-state-highlight to change the icon color
+			this._toggleClass( this.icon, null, "ui-icon-check ui-state-highlight", checked )
+				._toggleClass( this.icon, null, "ui-icon-blank", !checked );
+		}
+		if ( this.type === "radio" ) {
+			this._getRadioGroup()
+				.each( function() {
+					var instance = $( this ).checkboxradio( "instance" );
+
+					if ( instance ) {
+						instance._removeClass( instance.label,
+							"ui-checkboxradio-checked", "ui-state-active" );
+					}
+				} );
+		}
+	},
+
+	_destroy: function() {
+		this._unbindFormResetHandler();
+
+		if ( this.icon ) {
+			this.icon.remove();
+			this.iconSpace.remove();
+		}
+	},
+
+	_setOption: function( key, value ) {
+
+		// We don't alow the value to be set to nothing
+		if ( key === "label" && !value ) {
+			return;
+		}
+
+		this._super( key, value );
+
+		if ( key === "disabled" ) {
+			this._toggleClass( this.label, null, "ui-state-disabled", value );
+			this.element[ 0 ].disabled = value;
+
+			// Don't refresh if disabled
+			return;
+		}
+		this.refresh();
+	},
+
+	_updateIcon: function( checked ) {
+		var toAdd = "ui-icon ui-icon-background ";
+
+		if ( this.options.icon ) {
+			if ( !this.icon ) {
+				this.icon = $( "<span>" );
+				this.iconSpace = $( "<span> </span>" );
+				this._addClass( this.iconSpace, "ui-checkboxradio-icon-space" );
+			}
+
+			if ( this.type === "checkbox" ) {
+				toAdd += checked ? "ui-icon-check" : "ui-icon-blank";
+				this._removeClass( this.icon, null, checked ? "ui-icon-blank" : "ui-icon-check" );
+			} else {
+				toAdd += "ui-icon-blank";
+			}
+			this._addClass( this.icon, "ui-checkboxradio-icon", toAdd );
+			if ( !checked ) {
+				this._removeClass( this.icon, null, "ui-icon-check" );
+			}
+			this.icon.prependTo( this.label ).after( this.iconSpace );
+		} else if ( this.icon !== undefined ) {
+			this.icon.remove();
+			this.iconSpace.remove();
+			delete this.icon;
+		}
+	},
+
+	_updateLabel: function() {
+
+		// Remove the contents of the label ( minus the icon, icon space, and input )
+		this.label.contents().not( this.element.add( this.icon ).add( this.iconSpace ) ).remove();
+		this.label.append( this.options.label );
+	},
+
+	refresh: function() {
+		var checked = this.element[ 0 ].checked,
+			isDisabled = this.element[ 0 ].disabled;
+
+		this._updateIcon( checked );
+		this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
+		if ( this.options.label !== null ) {
+			this._updateLabel();
+		}
+
+		if ( isDisabled !== this.options.disabled ) {
+			this._setOptions( { "disabled": isDisabled } );
+		}
+	}
+
+} ] );
+
+return $.ui.checkboxradio;
+
+} ) );
diff --git a/ui/widgets/spinner.js b/ui/widgets/spinner.js
index f79b2baed..3a0b6deef 100644
--- a/ui/widgets/spinner.js
+++ b/ui/widgets/spinner.js
@@ -250,17 +250,19 @@ $.widget( "ui.spinner", {
 		// Button bindings
 		this.buttons = this.uiSpinner.children( "a" )
 			.attr( "tabIndex", -1 )
-			.button();
+			.button( {
+				classes: {
+					"ui-button": ""
+				}
+			} );
 
 		// TODO: Right now button does not support classes this is already updated in button PR
 		this._removeClass( this.buttons, "ui-corner-all" );
 
 		this._addClass( this.buttons.first(), "ui-spinner-button ui-spinner-up" );
 		this._addClass( this.buttons.last(), "ui-spinner-button ui-spinner-down" );
-		this._addClass( this.buttons.first().find( ".ui-button-text span" ), null,
-			"ui-icon " + this.options.icons.up );
-		this._addClass( this.buttons.last().find( ".ui-button-text span" ), null,
-			"ui-icon " + this.options.icons.down );
+		this.buttons.first().button( "option", "icon", this.options.icons.up );
+		this.buttons.last().button( "option", "icon", this.options.icons.down );
 
 		// IE 6 doesn't understand height: 50% for the buttons
 		// unless the wrapper has an explicit height
-- 
cgit v1.2.3