checkboxradio inherits theme from parent page Fixes jquery-archive#3660

Author: johnbender

js/jquery.mobile.forms.checkboxradio.js

@@ -47,9 +47,9 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
 			uncheckedicon: uncheckedicon
 		});
 
-		// If there's no selected theme...
+		// If there's no selected theme check the data attr
 		if( !this.options.theme ) {
-			this.options.theme = this.element.jqmData( "theme" );
+			this.options.theme = $.mobile.getInheritedTheme( this.element, "c" );
 		}
 
 		label.buttonMarkup({

tests/unit/checkboxradio/checkboxradio_core.js

@@ -182,4 +182,13 @@
 			}
 		], 2000);
 	});
+
+
+	test( "theme should be inherited", function() {
+		var $inherited = $( "#checkbox-inherit-theme" ),
+		    $explicit = $( "#checkbox-explicit-theme" );
+
+		ok( $inherited.siblings("label").hasClass( "ui-btn-up-a" ), "should inherit from page" );
+		ok( $explicit.siblings("label").hasClass( "ui-btn-up-b" ), "should not inherit" );
+	});
 })(jQuery);

tests/unit/checkboxradio/index.html

@@ -36,7 +36,7 @@ <h2 id="qunit-userAgent"></h2>
 <ol id="qunit-tests">
 </ol>
 
-<div data-nstest-role="page">
+<div data-nstest-role="page" data-nstest-theme="a">
 	<div data-nstest-role="content">
 		<div data-nstest-role="fieldcontain">
 			<fieldset data-nstest-role="controlgroup">
@@ -123,6 +123,20 @@ <h2 id="qunit-userAgent"></h2>
 		<label for="checkbox-change-triggered-2">click triggered</label>
 	</fieldset>
 </div>
+
+<div data-role="fieldcontain">
+	<fieldset data-role="controlgroup">
+		<legend>Agree to the terms:</legend>
+		<input type="checkbox" name="checkbox-inherit-theme" id="checkbox-inherit-theme"/>
+		<label for="checkbox-inherit-theme">foo</label>
+	</fieldset>
+
+	<fieldset data-role="controlgroup">
+		<legend>Agree to the terms:</legend>
+		<input type="checkbox" name="checkbox-explicit-theme" id="checkbox-explicit-theme" data-nstest-theme="b"/>
+		<label for="checkbox-explicit-theme">foo</label>
+	</fieldset>
+</div>
 </div>
 
 <div id="enhancetest">