Checkboxradio: PR Fixup

arschmitz · arschmitz · commit 08027658cc16 · 2015-04-22T11:14:17.000-04:00
diff --git a/demos/checkboxradio/product-selector.html b/demos/checkboxradio/product-selector.html
@@ -30,20 +30,20 @@
 			$( "input" ).filter( ":checked" ).not( this ).trigger( "change" );
 		});
 		$( "input" ).filter( ":checked" ).trigger( "change" );
-		$( ".shape-bar" ).controlgroup();
+		$( ".shape-bar, .brand" ).controlgroup();
 		$( ".toggles" ).controlgroup({
 			direction: "vertical"
 		});
 	});
 	</script>
 	<style>
 		.shape {
-			margin: 1em;
+			margin-left: 4.5em;
+			margin-top: 2.5em;
 			height: 8em;
 			width: 8em;
 			box-shadow: 4px 4px 8px;
 			color: #ccc;
-			margin-top: 1.5em;
 			background-repeat: no-repeat;
 			background-size: 90%;
 			background-position: 50%;
@@ -54,6 +54,9 @@
 		.pill, .rectangle {
 			width: 16em;
 		}
+		.square, .circle {
+			margin-left: 9em;
+		}
 		.border {
 			border: 2px solid #333333;
 		}
@@ -64,9 +67,6 @@
 			display: inline-block;
 			vertical-align: top;
 		}
-		.shape-wrap {
-			margin-bottom: 2em;
-		}
 		.controls {
 			background: #ccc;
 			padding: 1em;
@@ -77,7 +77,7 @@
 <body>
 <div class="controls">
 	<div class="brand-wrap">
-		<h2>1.) Select a brand</h2>
+		<h3>1.) Select a brand</h3>
 		<div class="brand">
 			<label for="brand-jquery">jQuery</label>
 			<input data-background-color="#0769AD" data-color="#7ACEF4" data-background-image="url(images/jquery.png)" type="radio" name="brand" id="brand-jquery">
@@ -92,7 +92,7 @@ <h2>1.) Select a brand</h2>
 		</div>
 	</div>
 	<div class="shape-wrap">
-		<h2>2.) Select a shape</h2>
+		<h3>2.) Select a shape</h3>
 		<div class="shape-bar">
 			<label for="shape-circle">Circle</label>
 			<input type="radio" name="shape" id="shape-circle" value="circle" checked>
@@ -105,7 +105,7 @@ <h2>2.) Select a shape</h2>
 		</div>
 	</div>
 	<div class="toggle-wrap">
-		<h2>3.) customize</h2>
+		<h3>3.) Customize</h3>
 		<div class="toggles">
 			<label for="color">Shadow</label>
 			<input class="toggle brand-toggle" type="checkbox" name="color" id="color">
@@ -121,7 +121,7 @@ <h2>3.) customize</h2>
 </div>
 
 <div class="demo-description">
-<p>Using two sets of radio buttons and one group of checkboxes to implement a product selector.</p>
+<p>Using two sets of radio buttons, as horizontal controlgroups, and one group of checkboxes, as a vertical controlgroup, to implement a product selector.</p>
 </div>
 </body>
 </html>
diff --git a/tests/unit/checkboxradio/checkboxradio.html b/tests/unit/checkboxradio/checkboxradio.html
@@ -4,28 +4,8 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Checkboxradio Test Suite</title>
 
-	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
-	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../../external/jquery-simulate/jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-	<script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
-	<script>
-	TestHelpers.loadResources({
-		css: [ "core", "button", "checkboxradio" ],
-		js: [
-			"ui/core.js",
-			"ui/widget.js",
-			"ui/checkboxradio.js"
-		]
-	});
-	</script>
-
-	<script src="checkboxradio_common.js"></script>
-	<script src="checkboxradio_core.js"></script>
-	<script src="checkboxradio_methods.js"></script>
-	<script src="checkboxradio_options.js"></script>
-	<script src="../swarminject.js"></script>
+	<script src="../../lib/css.js" data-modules="core button checkboxradio"></script>
+	<script src="../../lib/bootstrap.js" data-modules="common core methods options"></script>
 </head>
 <body>
 
diff --git a/tests/unit/checkboxradio/common.js b/tests/unit/checkboxradio/common.js
@@ -1,4 +1,9 @@
-TestHelpers.commonWidgetTests( "checkboxradio", {
+define( [
+	"lib/common",
+	"ui/checkboxradio"
+], function( common ) {
+
+common.testWidget( "checkboxradio", {
 	noDefaultElement: true,
 	defaults: {
 		disabled: null,
@@ -13,3 +18,5 @@ TestHelpers.commonWidgetTests( "checkboxradio", {
 		create: null
 	}
 });
+
+} );
diff --git a/tests/unit/checkboxradio/core.js b/tests/unit/checkboxradio/core.js
@@ -1,9 +1,7 @@
-/*
- * checkboxradio_core.js
- */
-
-
-(function($) {
+define( [
+	"jquery",
+	"ui/checkboxradio"
+], function( $ ) {
 
 module( "Checkboxradio: core" );
 test( "Checkbox - Initial class structure", function( assert ) {
@@ -178,4 +176,5 @@ test( "Calling checkboxradio on an input with no label throws an error", functio
 		"Proper error thrown"
 	);
 });
-})(jQuery);
+
+} );
diff --git a/tests/unit/checkboxradio/methods.js b/tests/unit/checkboxradio/methods.js
@@ -1,9 +1,8 @@
-/*
-* checkboxradio_methods.js
-*/
+define( [
+	"jquery",
+	"ui/checkboxradio"
+], function( $ ) {
 
-
-(function($) {
 module( "Checkboxradio: methods" );
 
 $.each( [ "checkbox", "radio" ], function( index, value ) {
@@ -49,9 +48,9 @@ $.each( [ "checkbox", "radio" ], function( index, value ) {
 		assert.lacksClasses( widget, "ui-checkboxradio-checked" );
 	});
 
-	test( value + ": destroy", function(){
+	test( value + ": destroy", function( assert ){
 		expect( 1 );
-		domEqual( "#" + value + "-method-destroy", function() {
+		assert.domEqual( "#" + value + "-method-destroy", function() {
 			$( "#" + value + "-method-destroy" ).checkboxradio().checkboxradio( "destroy" );
 		});
 	});
@@ -95,4 +94,4 @@ test( "Input wrapped in a label preserved on refresh", function() {
 	strictEqual( input.parent()[ 0 ], element[ 0 ], "Input preserved" );
 });
 
-})(jQuery);
+} );
diff --git a/tests/unit/checkboxradio/options.js b/tests/unit/checkboxradio/options.js
@@ -1,8 +1,7 @@
-/*
-* checkboxradio_methods.js
-*/
-
-(function($) {
+define( [
+	"jquery",
+	"ui/checkboxradio"
+], function( $ ) {
 
 module( "Checkboxradio: options" );
 
@@ -199,4 +198,4 @@ test( "label", function() {
 
 });
 
-})(jQuery);
+} );
