switch control group to explicit call site exclusion

Author: johnbender

js/jquery.mobile.controlGroup.js

@@ -7,19 +7,14 @@ define( [ "jquery", "./jquery.mobile.buttonMarkup" ], function( $ ) {
 (function( $, undefined ) {
 
 $.fn.controlgroup = function( options ) {
-	var $workingSet = this;
-
-	// trim the working set when ignoring content is switched on
-	$workingSet = $.mobile.enhanceable( $workingSet );
-
 	function flipClasses( els, flCorners  ) {
 		els.removeClass( "ui-btn-corner-all ui-shadow" )
 			.eq( 0 ).addClass( flCorners[ 0 ] )
 			.end()
 			.last().addClass( flCorners[ 1 ] ).addClass( "ui-controlgroup-last" );
 	}
 
-	return $workingSet.each(function() {
+	return this.each(function() {
 		var $el = $( this ),
 			o = $.extend({
 						direction: $el.jqmData( "type" ) || "vertical",

js/jquery.mobile.core.js

@@ -270,6 +270,11 @@ define( [ "jquery", "../external/requirejs/text!../version.txt", "./jquery.mobil
 		return $( "<div/>" ).text( $(this).text() ).html();
 	};
 
+	// fluent helper function for the mobile namespaced equivalent
+	$.fn.jqmEnhanceable = function() {
+		return $.mobile.enhanceable( this );
+	};
+
 	// Monkey-patching Sizzle to filter the :jqmData selector
 	var oldFind = $.find,
 		jqmDataRE = /:jqmData\(([^)]*)\)/g;

js/jquery.mobile.init.js

@@ -167,7 +167,9 @@ define( [ "jquery", "./jquery.mobile.core", "./jquery.mobile.support", "./jquery
 		//auto self-init widgets for those widgets that have a soft dependency on others
 		if ( $.fn.controlgroup ) {
 			$( document ).bind( "pagecreate create", function( e ){
-				$( ":jqmData(role='controlgroup')", e.target ).controlgroup({ excludeInvisible: false });
+				$( ":jqmData(role='controlgroup')", e.target )
+					.jqmEnhanceable()
+					.controlgroup({ excludeInvisible: false });
 			});
 		}
 

tests/unit/controlgroup/controlgroup_core.js

@@ -130,12 +130,14 @@
 
 		$.mobile.ignoreContentEnabled = true;
 
-		$unenhancedFieldSet.controlgroup();
+		// attempt to enhance the controlgroup
+		$unenhancedFieldSet.parent().trigger("create");
 
 		same( $unenhancedFieldSet.length, 1, "the fieldset test fixtures exist" );
 		ok( !$unenhancedFieldSet.is(".ui-controlgroup"), "there is no control group" );
 
-		$enhancedFieldSet.controlgroup();
+		// attempt to enhance the controlgroup
+		$enhancedFieldSet.parent().trigger("create");
 
 		same( $enhancedFieldSet.length, 1, "the fieldset test fixtures exist" );
 		ok( $enhancedFieldSet.is(".ui-controlgroup"), "there is a control group" );

tests/unit/controlgroup/index.html

@@ -75,8 +75,9 @@ <h2 id="qunit-userAgent"></h2>
 
 	</div>
 </div>
+
 <div data-nstest-enhance="false" data-nstest-role="fieldcontain" id="unenhanced-fieldcontain">
-	<fieldset data-nstest-type="horizontal" id="unenhanced-fieldset">
+	<fieldset data-nstest-type="horizontal" id="unenhanced-fieldset" data-nstest-role="controlgroup">
 		<input type="checkbox" name="checkbox-10" id="checkbox-10" class="custom" />
 		<label for="checkbox-10">b</label>
 
@@ -86,7 +87,7 @@ <h2 id="qunit-userAgent"></h2>
 </div>
 
 <div data-nstest-role="fieldcontain" id="enhanced-fieldcontain">
-	<fieldset data-nstest-type="horizontal" id="enhanced-fieldset">
+	<fieldset data-nstest-type="horizontal" id="enhanced-fieldset" data-nstest-role="controlgroup">
 		<input type="checkbox" name="checkbox-12" id="checkbox-12" class="custom" />
 		<label for="checkbox-12">b</label>