Skip to content
This repository has been archived by the owner on Oct 8, 2021. It is now read-only.

Fixes #4220 - Collapsible - add active state on tap #4314

Merged
merged 1 commit into from May 10, 2012
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion js/jquery.mobile.collapsible.js
Expand Up @@ -107,7 +107,9 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
.end() .end()
.find( ".ui-icon" ) .find( ".ui-icon" )
.toggleClass( "ui-icon-" + expandedIcon, !isCollapse ) .toggleClass( "ui-icon-" + expandedIcon, !isCollapse )
.toggleClass( "ui-icon-" + collapsedIcon, isCollapse ); .toggleClass( "ui-icon-" + collapsedIcon, isCollapse )
.end()
.find( "a" ).first().removeClass( $.mobile.activeBtnClass );


$this.toggleClass( "ui-collapsible-collapsed", isCollapse ); $this.toggleClass( "ui-collapsible-collapsed", isCollapse );
collapsibleContent.toggleClass( "ui-collapsible-content-collapsed", isCollapse ).attr( "aria-hidden", isCollapse ); collapsibleContent.toggleClass( "ui-collapsible-content-collapsed", isCollapse ).attr( "aria-hidden", isCollapse );
Expand All @@ -124,6 +126,9 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
.trigger( o.collapsed ? "collapse" : "expand" ); .trigger( o.collapsed ? "collapse" : "expand" );


collapsibleHeading collapsibleHeading
.bind( "tap", function( event ) {
collapsibleHeading.find( "a" ).first().addClass( $.mobile.activeBtnClass );
})
.bind( "click", function( event ) { .bind( "click", function( event ) {


var type = collapsibleHeading.is( ".ui-collapsible-heading-collapsed" ) ? var type = collapsibleHeading.is( ".ui-collapsible-heading-collapsed" ) ?
Expand All @@ -132,6 +137,7 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
collapsible.trigger( type ); collapsible.trigger( type );


event.preventDefault(); event.preventDefault();
event.stopPropagation();
}); });
} }
}); });
Expand Down