From 563169def902541e1d98d82417bff703eb752c70 Mon Sep 17 00:00:00 2001
From: scottjehl <scott@scottjehl.com>
Date: Wed, 10 Nov 2010 23:19:41 -0500
Subject: [PATCH] made sure data-icon attrs work on radio and checks. Fixes
 #423, Fixes #424

---
 docs/forms/forms-radiobuttons.html      | 18 +++++++++---------
 js/jquery.mobile.forms.checkboxradio.js |  6 ++----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/docs/forms/forms-radiobuttons.html b/docs/forms/forms-radiobuttons.html
index 454ad82c..3a13eef8 100755
--- a/docs/forms/forms-radiobuttons.html
+++ b/docs/forms/forms-radiobuttons.html
@@ -56,10 +56,10 @@
 	<div data-role="fieldcontain">
 	    <fieldset data-role="controlgroup">
 	    	<legend>Choose a pet:</legend>
-	         	<input type="radio" name="radio-pet-1" id="radio-pet-1" value="choice-1" checked="checked" data-theme="a" />
+	         	<input type="radio" name="radio-pet-1" id="radio-pet-1" value="choice-1" checked="checked"  />
 	         	<label for="radio-pet-1">Cat</label>
 
-	         	<input type="radio" name="radio-pet-1" id="radio-pet-2" value="choice-2"  data-theme="a"  />
+	         	<input type="radio" name="radio-pet-1" id="radio-pet-2" value="choice-2"  />
 	         	<label for="radio-pet-2">Dog</label>
 
 	         	<input type="radio" name="radio-pet-1" id="radio-pet-3" value="choice-3"  />
@@ -83,11 +83,11 @@
 	<div data-role="fieldcontain">
 	    <fieldset data-role="controlgroup" data-type="horizontal">
 	     	<legend>Layout view:</legend>
-	         	<input type="radio" name="radio-view" id="radio-view-a" value="list" data-icon="false" />
+	         	<input type="radio" name="radio-view" id="radio-view-a" value="list"  />
 	         	<label for="radio-view-a">List</label>
-	         	<input type="radio" name="radio-view" id="radio-view-b" value="grid" data-icon="false" />
+	         	<input type="radio" name="radio-view" id="radio-view-b" value="grid"  />
 	         	<label for="radio-view-b">Grid</label>
-	         	<input type="radio" name="radio-view" id="radio-view-c" value="gallery" data-icon="false" />
+	         	<input type="radio" name="radio-view" id="radio-view-c" value="gallery"  />
 	         	<label for="radio-view-c">Gallery</label>
 	    </fieldset>
 	</div>
@@ -95,16 +95,16 @@
 	<!--
 	<h2>No icon option</h2>
 	
-	<p>If you don't want the default radiobutton icon to be added, add the <code>data-icon="false"</code> attribute to each radio <code>input</code>. </p>
+	<p>If you don't want the default radiobutton icon to be added, add the <code></code> attribute to each radio <code>input</code>. </p>
 		
 		<div data-role="fieldcontain">
 	    <fieldset data-role="controlgroup">
 	     	<legend>These don't have the radio state icons:</legend>
-	         	<input type="radio" name="radio-noicon" id="radio-noicon1" value="a" data-icon="false" checked="checked" />
+	         	<input type="radio" name="radio-noicon" id="radio-noicon1" value="a"  checked="checked" />
 	         	<label for="radio-noicon1">Yes</label>
-	         	<input type="radio" name="radio-noicon" id="radio-noicon2" value="b" data-icon="false" />
+	         	<input type="radio" name="radio-noicon" id="radio-noicon2" value="b"  />
 	         	<label for="radio-noicon2">No</label>
-	         	<input type="radio" name="radio-noicon" id="radio-noicon3" value="c" data-icon="false" />
+	         	<input type="radio" name="radio-noicon" id="radio-noicon3" value="c"  />
 	         	<label for="radio-noicon3">Maybe</label>
 	    </fieldset>
 		</div>
diff --git a/js/jquery.mobile.forms.checkboxradio.js b/js/jquery.mobile.forms.checkboxradio.js
index 9f4c4826..68531519 100644
--- a/js/jquery.mobile.forms.checkboxradio.js
+++ b/js/jquery.mobile.forms.checkboxradio.js
@@ -7,8 +7,7 @@
 (function ( $ ) {
 $.widget( "mobile.checkboxradio", $.mobile.widget, {
 	options: {
-		theme: undefined,
-		icon: undefined
+		theme: null
 	},
 	_create: function(){
 		var input = this.element,
@@ -21,9 +20,8 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
 						
 		label
 			.buttonMarkup({
-				iconpos: this.options.icon,
 				theme: this.options.theme,
-				icon: this.options.icon ? uncheckedicon : ( this.element.parents( "[data-type='horizontal']" ).length ? undefined : uncheckedicon ),
+				icon: this.element.parents( "[data-type='horizontal']" ).length ? undefined : uncheckedicon,
 				shadow: false
 			});