Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixes #3699, fixes #3681 — theme is now being inherited correctly on …

…collapsible headings/sets.
  • Loading branch information...
commit 97b7ad62e7e25c43ac3a50dc091792db11f71721 1 parent 2e8d7fe
@Wilto Wilto authored
View
2  js/jquery.mobile.collapsible.js
@@ -36,7 +36,7 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
if ( collapsibleSet.length ) {
// Inherit the theme from collapsible-set
if ( !o.theme ) {
- o.theme = collapsibleSet.jqmData( "theme" );
+ o.theme = $.mobile.getInheritedTheme( collapsibleSet, "c" );
}
// Inherit the content-theme from collapsible-set
if ( !o.contentTheme ) {
View
2  js/jquery.mobile.collapsibleSet.js
@@ -16,7 +16,7 @@ $.widget( "mobile.collapsibleset", $.mobile.widget, {
// Inherit the theme from collapsible-set
if ( !o.theme ) {
- o.theme = $el.jqmData( "theme" );
+ o.theme = $.mobile.getInheritedTheme( $el, "c" );
}
// Inherit the content-theme from collapsible-set
if ( !o.contentTheme ) {
Please sign in to comment.
Something went wrong with that request. Please try again.