enhanceWithin: store element sets for widgets before any enhancment takes place Fixes jquery-archive#6621 - Dynamically injected popup with header/footer not enhanced properly

Author: arschmitz

js/jquery.mobile.helpers.js

@@ -173,7 +173,8 @@ define( [ "jquery", "./jquery.mobile.ns", "./jquery.ui.core" ], function( jQuery
 
 		// Enhance child elements
 		enhanceWithin: function() {
-			var widgetElements,
+			var index,
+				widgetElements ={},
 				that = this;
 
 			// Add no js class to elements
@@ -198,7 +199,8 @@ define( [ "jquery", "./jquery.mobile.ns", "./jquery.ui.core" ], function( jQuery
 
 			// Add classes for fieldContain
 			if ( $.fn.fieldcontain ) {
-				this.find( ":jqmData(role='fieldcontain')" ).jqmEnhanceable().fieldcontain();
+				this.find( ":jqmData(role='fieldcontain')" ).not( $.mobile.page.prototype.keepNativeSelector() )
+				.jqmEnhanceable().fieldcontain();
 			}
 
 			// Enhance widgets
@@ -208,21 +210,25 @@ define( [ "jquery", "./jquery.mobile.ns", "./jquery.ui.core" ], function( jQuery
 				if ( constructor.initSelector ) {
 
 					// Filter elements that should not be enhanced based on parents
-					widgetElements = $.mobile.enhanceable( that.find( constructor.initSelector ) );
+					var elements = $.mobile.enhanceable( that.find( constructor.initSelector ) );
 
 					// If any matching elements remain filter ones with keepNativeSelector
-					if ( widgetElements.length ) {
+					if ( elements.length ) {
 
 						// $.mobile.page.prototype.keepNativeSelector is deprecated this is just for backcompat
 						// Switch to $.mobile.keepNative in 1.5 which is just a value not a function
-						widgetElements = widgetElements.not( $.mobile.page.prototype.keepNativeSelector() );
+						elements = elements.not( $.mobile.page.prototype.keepNativeSelector() );
 					}
 
 					// Enhance whatever is left
-					widgetElements[ constructor.prototype.widgetName ]();
+					widgetElements[ constructor.prototype.widgetName ] = elements;
 				}
 			});
 
+			for ( index in widgetElements ) {
+				widgetElements[ index ][ index ]();
+			}
+
 			return this;
 		},