Controlgroup: ensure load order does not matter for child widgets

jquery-archive · Aug 6, 2013 · 92ef12a · 92ef12a
1 parent b6d9912
commit 92ef12a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/js/widgets/controlgroup.js b/js/widgets/controlgroup.js
@@ -31,9 +31,9 @@ $.widget( "mobile.controlgroup", $.extend( {
 			this.element.find( $.mobile.enhanceWithButtonMarkup.initSelector ).each( $.mobile.enhanceWithButtonMarkup );
 		}
 		// Enhance child widgets
-		$.each( this._childWidgets, $.proxy( function( number, widget ) {
-			if( widget ) {
-				this.element.find( widget.initSelector )[ widget.prototype.widgetName ]();
+		$.each( this._childWidgets, $.proxy( function( number, widgetName ) {
+			if( $.mobile[ widgetName ] ) {
+				this.element.find( $.mobile[ widgetName ].initSelector )[ widgetName ]();
 			}
 		}, this ));
 
@@ -53,7 +53,7 @@ $.widget( "mobile.controlgroup", $.extend( {
 
 	},
 
-	_childWidgets: [ $.mobile.checkboxradio, $.mobile.selectmenu, $.mobile.button ],
+	_childWidgets: [ "checkboxradio", "selectmenu", "button" ],
 
 	_themeClassFromOption: function( value ) {
 		return ( value ? ( value === "none" ? "" : "ui-group-theme-" + value ) : "" );

diff --git a/tests/unit/controlgroup/index.html b/tests/unit/controlgroup/index.html
@@ -13,12 +13,14 @@
 	<script src="../../../external/qunit.js"></script>
 	<script>
 		$.testHelper.asyncLoad([
-			[ "widgets/page" ],
+			['widgets/page'],
 			[
-				"widgets/forms/checkboxradio",
 				"widgets/controlgroup",
 				"jquery.mobile.buttonMarkup"
+
 			],
+			["widgets/forms/checkboxradio"],
+
 			[ "jquery.mobile.init" ],
 			[ "controlgroup_core.js" ]
 		]);