Hopiu/jquery-mobile
1
0
Fork 0
mirror of https://github.com/Hopiu/jquery-mobile.git synced 2026-05-03 20:34:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'jquery/master'

Browse source
This commit is contained in:
Matthias Derer 2011-06-09 08:50:56 +02:00
commit 506c1d974c
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
js/jquery.mobile.collapsible.js
View file

@ -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)" )

4
js/jquery.mobile.forms.checkboxradio.js
View file

@ -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 );

1
themes/default/jquery.mobile.forms.select.css
View file

@ -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; }