Changed getInheritedTheme fallback to swatch "a"

jquery-archive · Apr 9, 2013 · 08bcd6c · 08bcd6c
1 parent e6e8d04
commit 08bcd6c
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/js/jquery.mobile.buttonMarkup.js b/js/jquery.mobile.buttonMarkup.js
@@ -31,7 +31,7 @@ $.fn.buttonMarkup = function( options ) {
 			o = $.extend( {}, $.fn.buttonMarkup.defaults, {
 				icon:       options.icon       !== undefined ? options.icon       : getAttrFixed( e, nsKey + "icon" ),
 				iconpos:    options.iconpos    !== undefined ? options.iconpos    : getAttrFixed( e, nsKey + "iconpos" ),
-				theme:      options.theme      !== undefined ? options.theme      : getAttrFixed( e, nsKey + "theme" ) || $.mobile.getInheritedTheme( el, "c" ),
+				theme:      options.theme      !== undefined ? options.theme      : getAttrFixed( e, nsKey + "theme" ) || $.mobile.getInheritedTheme( el, "a" ),
 				inline:     options.inline     !== undefined ? options.inline     : getAttrFixed( e, nsKey + "inline" ),
 				shadow:     options.shadow     !== undefined ? options.shadow     : getAttrFixed( e, nsKey + "shadow" ),
 				corners:    options.corners    !== undefined ? options.corners    : getAttrFixed( e, nsKey + "corners" ),
@@ -90,7 +90,7 @@ $.fn.buttonMarkup = function( options ) {
 
 		// if not, try to find closest theme container
 		if ( !o.theme ) {
-			o.theme = $.mobile.getInheritedTheme( el, "c" );
+			o.theme = $.mobile.getInheritedTheme( el, "a" );
 		}
 
 		buttonClass = "ui-btn ";

diff --git a/js/widgets/collapsible.js b/js/widgets/collapsible.js
@@ -45,7 +45,7 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
 		if ( collapsibleSet.length ) {
 			// Inherit the theme from collapsible-set
 			if ( !o.theme ) {
-				o.theme = collapsibleSet.jqmData( "theme" ) || $.mobile.getInheritedTheme( collapsibleSet, "c" );
+				o.theme = collapsibleSet.jqmData( "theme" ) || $.mobile.getInheritedTheme( collapsibleSet, "a" );
 			}
 			// Inherit the content-theme from collapsible-set
 			if ( !o.contentTheme ) {
@@ -76,7 +76,7 @@ $.widget( "mobile.collapsible", $.mobile.widget, {
 		} else {
 			// get inherited theme if not a set and no theme has been set
 			if ( !o.theme ) {
-				o.theme = $.mobile.getInheritedTheme( $el, "c" );
+				o.theme = $.mobile.getInheritedTheme( $el, "a" );
 			}
 		}
 

diff --git a/js/widgets/collapsibleSet.js b/js/widgets/collapsibleSet.js
@@ -19,7 +19,7 @@ $.widget( "mobile.collapsibleset", $.mobile.widget, $.extend( {
 
 		// Inherit the theme from collapsible-set
 		if ( !o.theme ) {
-			o.theme = $.mobile.getInheritedTheme( $el, "c" );
+			o.theme = $.mobile.getInheritedTheme( $el, "a" );
 		}
 		// Inherit the content-theme from collapsible-set
 		if ( !o.contentTheme ) {

diff --git a/js/widgets/forms/button.js b/js/widgets/forms/button.js
@@ -57,7 +57,7 @@ $.widget( "mobile.button", $.mobile.widget, {
 		// get the inherited theme
 		// TODO centralize for all widgets
 		if ( !o.theme ) {
-			o.theme = $.mobile.getInheritedTheme( $el, "c" );
+			o.theme = $.mobile.getInheritedTheme( $el, "a" );
 		}
 		o.disabled = $el.prop( "disabled" );
 		o = splitOptions( o );

diff --git a/js/widgets/forms/checkboxradio.js b/js/widgets/forms/checkboxradio.js
@@ -48,7 +48,7 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, $.extend( {
 
 		// If there's no selected theme check the data attr
 		if ( !o.theme ) {
-			o.theme = $.mobile.getInheritedTheme( this.element, "c" );
+			o.theme = $.mobile.getInheritedTheme( this.element, "a" );
 		}
 
 		// Expose for other methods

diff --git a/js/widgets/forms/select.js b/js/widgets/forms/select.js
@@ -72,7 +72,7 @@ $.widget( "mobile.selectmenu", $.mobile.widget, $.extend( {
 		this.label = $( "label[for='"+ this.selectID +"']" ).addClass( "ui-select" );
 		this.isMultiple = this.select[ 0 ].multiple;
 		if ( !this.options.theme ) {
-			this.options.theme = $.mobile.getInheritedTheme( this.select, "c" );
+			this.options.theme = $.mobile.getInheritedTheme( this.select, "a" );
 		}
 	},
 

diff --git a/js/widgets/forms/slider.js b/js/widgets/forms/slider.js
@@ -31,7 +31,7 @@ $.widget( "mobile.slider", $.mobile.widget, $.extend( {
 		// TODO: Each of these should have comments explain what they're for
 		var self = this,
 			control = this.element,
-			parentTheme = $.mobile.getInheritedTheme( control, "c" ),
+			parentTheme = $.mobile.getInheritedTheme( control, "a" ),
 			theme = this.options.theme || parentTheme,
 			trackTheme = this.options.trackTheme || parentTheme,
 			cType = control[ 0 ].nodeName.toLowerCase(),
@@ -356,7 +356,7 @@ $.widget( "mobile.slider", $.mobile.widget, $.extend( {
 		//       alteration of the input value, which should still update the slider
 
 		var self = this,
-			parentTheme = $.mobile.getInheritedTheme( this.element, "c" ),
+			parentTheme = $.mobile.getInheritedTheme( this.element, "a" ),
 			theme = this.options.theme || parentTheme,
 			trackTheme = this.options.trackTheme || parentTheme,
 			left, width, data, tol;

diff --git a/js/widgets/forms/slider.tooltip.js b/js/widgets/forms/slider.tooltip.js
@@ -65,7 +65,7 @@ $.widget( "mobile.slider", $.mobile.slider, {
 		} else if ( key === "popupEnabled" ) {
 			if ( value && !this._popup ) {
 				this._popup = getPopup()
-					.addClass( "ui-body-" + ( this.options.theme || $.mobile.getInheritedTheme( this.element, "c" ) ) )
+					.addClass( "ui-body-" + ( this.options.theme || $.mobile.getInheritedTheme( this.element, "a" ) ) )
 					.insertBefore( this.element );
 			}
 		}

diff --git a/js/widgets/forms/textinput.js b/js/widgets/forms/textinput.js
@@ -27,7 +27,7 @@ $.widget( "mobile.textinput", $.mobile.widget, {
 		var self = this,
 			input = this.element,
 			o = this.options,
-			theme = o.theme || $.mobile.getInheritedTheme( this.element, "c" ),
+			theme = o.theme || $.mobile.getInheritedTheme( this.element, "a" ),
 			themeclass  = " ui-body-" + theme,
 			miniclass = o.mini ? " ui-mini" : "",
 			isSearch = input.is( "[type='search'], :jqmData(type='search')" ),

diff --git a/js/widgets/listview.js b/js/widgets/listview.js
@@ -134,7 +134,7 @@ $.widget( "mobile.listview", $.mobile.widget, $.extend( {
 		}
 
 		if ( !o.theme ) {
-			o.theme = $.mobile.getInheritedTheme( this.element, "c" );
+			o.theme = $.mobile.getInheritedTheme( this.element, "a" );
 		}
 
 		for ( var pos = 0, numli = li.length; pos < numli; pos++ ) {

diff --git a/js/widgets/popup.arrow.js b/js/widgets/popup.arrow.js
@@ -58,7 +58,7 @@ $.widget( "mobile.popup", $.mobile.popup, {
 	_updateArrow: function( direction ) {
 		var ar = this._ui.arrow,
 			oldTheme = ar.ct.jqmData( "oldTheme" ),
-			theme = "ui-body-" + ( this.options.theme || $.mobile.getInheritedTheme( this.element, "c" ) );
+			theme = "ui-body-" + ( this.options.theme || $.mobile.getInheritedTheme( this.element, "a" ) );
 
 		// Remove old direction and theme
 		ar.ct.removeClass( "l t r b" );

diff --git a/js/widgets/popup.js b/js/widgets/popup.js
@@ -611,7 +611,7 @@ define( [
 			this._applyTransition( o.transition );
 
 			if ( !this.options.theme ) {
-				this._setTheme( this._page.jqmData( "theme" ) || $.mobile.getInheritedTheme( this._page, "c" ) );
+				this._setTheme( this._page.jqmData( "theme" ) || $.mobile.getInheritedTheme( this._page, "a" ) );
 			}
 
 			this._ui.screen.removeClass( "ui-screen-hidden" );