Checkboxradio: Fixup demos

arschmitz · arschmitz · commit 8ec2d1559fb9 · 2015-02-04T11:08:48.000-05:00
diff --git a/demos/checkboxradio/default.html b/demos/checkboxradio/default.html
@@ -23,7 +23,7 @@ <h2>Checkbox</h2>
 	<label for="checkbox-1">Checkbox</label>
 	<input type="checkbox" name="checkbox-1" id="checkbox-1">
 	<label>Checkbox nested in label
-		<input type="checkbox" name="checkbox-1" id="checkbox-1">
+		<input type="checkbox" name="checkbox-2" id="checkbox-2">
 	</label>
 	<h2>Radio Group</h2>
 
diff --git a/demos/checkboxradio/icons.html b/demos/checkboxradio/icons.html
@@ -25,7 +25,7 @@ <h2>Checkbox</h2>
 	<label for="checkbox-1">Checkbox</label>
 	<input type="checkbox" name="checkbox-1" id="checkbox-1">
 	<label>Checkbox nested in label
-		<input type="checkbox" name="checkbox-1" id="checkbox-1">
+		<input type="checkbox" name="checkbox-2" id="checkbox-2">
 	</label>
 	<h2>Radio Group</h2>
 
diff --git a/demos/checkboxradio/index.html b/demos/checkboxradio/index.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<title>jQuery UI Checkboxradio Demos</title>
+</head>
+<body>
+
+<ul>
+	<li><a href="default.html">Default functionality</a></li>
+	<li><a href="icons.html">Icons</a></li>
+</ul>
+
+</body>
+</html>
diff --git a/demos/index.html b/demos/index.html
@@ -11,6 +11,7 @@
 	<li><a href="accordion/">accordion</a></li>
 	<li><a href="autocomplete/">autocomplete</a></li>
 	<li><a href="button/">button</a></li>
+	<li><a href="checkboxradio/">checkboxradio</a></li>
 	<li><a href="datepicker/">datepicker</a></li>
 	<li><a href="dialog/">dialog</a></li>
 	<li><a href="draggable/">draggable</a></li>
diff --git a/tests/unit/checkboxradio/checkboxradio.html b/tests/unit/checkboxradio/checkboxradio.html
@@ -7,11 +7,11 @@
 	<script src="../../jquery.js"></script>
 	<link rel="stylesheet" href="../../../external/qunit/qunit.css">
 	<script src="../../../external/qunit/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
+	<script src="../../../external/jquery-simulate/jquery.simulate.js"></script>
 	<script src="../testsuite.js"></script>
 	<script>
 	TestHelpers.loadResources({
-		css: [ "core", "ui.button", "ui.checkboxradio" ],
+		css: [ "core", "button", "checkboxradio" ],
 		js: [
 			"ui/core.js",
 			"ui/widget.js",
diff --git a/tests/visual/index.html b/tests/visual/index.html
@@ -31,6 +31,11 @@ <h2>Button</h2>
 			<li><a href="button/performance.html">Performance</a></li>
 		</ul>
 
+		<h2>Checkboxradio</h2>
+		<ul>
+			<li><a href="button/checkboxradio.html">General</a></li>
+		</ul>
+
 		<h2>Dialog</h2>
 		<ul>
 			<li><a href="dialog/animated.html">Animations</a></li>
diff --git a/ui/checkboxradio.js b/ui/checkboxradio.js
@@ -70,6 +70,8 @@ $.widget( "ui.checkboxradio", {
 		}
 	},
 
+	defaultElement: "<input type='checkbox'>",
+
 	_getCreateOptions: function() {
 		var disabled,
 			that = this,

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,8 @@ $.widget( "ui.checkboxradio", {`
`70`	`70`	`}`
`71`	`71`	`},`
`72`	`72`
	`73`	`+ defaultElement: "<input type='checkbox'>",`
	`74`	`+`
`73`	`75`	`_getCreateOptions: function() {`
`74`	`76`	`var disabled,`
`75`	`77`	`that = this,`