Skip to content
This repository
Browse code

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

…collapsible headings/sets.
  • Loading branch information...
commit 97b7ad62e7e25c43ac3a50dc091792db11f71721 1 parent 2e8d7fe
Mat Marquis authored March 01, 2012
2  js/jquery.mobile.collapsible.js
@@ -36,7 +36,7 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
36 36
 		if ( collapsibleSet.length ) {
37 37
 			// Inherit the theme from collapsible-set
38 38
 			if ( !o.theme ) {
39  
-				o.theme = collapsibleSet.jqmData( "theme" );
  39
+				o.theme = $.mobile.getInheritedTheme( collapsibleSet, "c" );
40 40
 			}
41 41
 			// Inherit the content-theme from collapsible-set
42 42
 			if ( !o.contentTheme ) {
2  js/jquery.mobile.collapsibleSet.js
@@ -16,7 +16,7 @@ $.widget( "mobile.collapsibleset", $.mobile.widget, {
16 16
 
17 17
 		// Inherit the theme from collapsible-set
18 18
 		if ( !o.theme ) {
19  
-			o.theme = $el.jqmData( "theme" );
  19
+			o.theme = $.mobile.getInheritedTheme( $el, "c" );
20 20
 		}
21 21
 		// Inherit the content-theme from collapsible-set
22 22
 		if ( !o.contentTheme ) {

0 notes on commit 97b7ad6

Please sign in to comment.
Something went wrong with that request. Please try again.