Merge remote branch 'jquery/master'

Author: bestform

js/jquery.mobile.collapsible.js

@@ -72,7 +72,7 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
 		//events
 		collapsibleContain
 			.bind( "collapse", function( event ){
-				if( !event.isDefaultPrevented() ){
+				if( !event.isDefaultPrevented() && $( event.target ).closest( ".ui-collapsible-contain" ).is( collapsibleContain ) ){
 					event.preventDefault();
 					collapsibleHeading
 						.addClass( "ui-collapsible-heading-collapsed" )
@@ -89,7 +89,7 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
 				}
 
 			} )
-			.bind( "expand", function( event ){
+			.bind( "expand", function( event ){	
 				if( !event.isDefaultPrevented() ){
 					event.preventDefault();
 					collapsibleHeading
@@ -114,14 +114,16 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
 			collapsibleParent
 				.jqmData( "collapsiblebound", true )
 				.bind( "expand", function( event ){
-					$( this ).find( ".ui-collapsible-contain" )
-						.not( $( event.target ).closest( ".ui-collapsible-contain" ) )
-						.not( "> .ui-collapsible-contain .ui-collapsible-contain" )
+					
+					$( event.target )
+						.closest( ".ui-collapsible-contain" )
+						.siblings( ".ui-collapsible-contain" )
 						.trigger( "collapse" );
+					
 				} );
 
 
-			var set = collapsibleParent.find( ":jqmData(role=collapsible )" );
+			var set = collapsibleParent.find( ":jqmData(role=collapsible ):first" );
 
 			set.first()
 				.find( "a:eq(0)" )

js/jquery.mobile.forms.checkboxradio.js

@@ -150,11 +150,11 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
 	},
 
 	disable: function(){
-		this.element.attr("disabled",true).parent().addClass("ui-disabled");
+		this.element.prop("disabled",true).parent().addClass("ui-disabled");
 	},
 
 	enable: function(){
-		this.element.attr("disabled",false).parent().removeClass("ui-disabled");
+		this.element.prop("disabled",false).parent().removeClass("ui-disabled");
 	}
 });
 })( jQuery );

themes/default/jquery.mobile.forms.select.css

@@ -7,6 +7,7 @@
 .ui-select select { position: absolute; left: -9999px; top: -9999px; }
 .ui-select .ui-btn { overflow: hidden; }
 .ui-select .ui-btn select { cursor: pointer; -webkit-appearance: button; left: 0; top:0; width: 100%; height: 100%; text-indent: -999em; opacity: 0.0001; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter: alpha(opacity=0); }
+.ui-select .ui-btn option { text-indent: 0; }
 .ui-select .ui-btn select.ui-select-nativeonly { opacity: 1; text-indent: 0; }
 
 .ui-select .ui-btn-icon-right .ui-btn-inner { padding-right: 45px; }