There are 2 supported list view styles. The system defaults to the "a" swatch (silver in default theme) and it can be switched to "b" via the data-theme attribute.
The powerful thing about the new jQuery Mobile theme system is that you can now add as many color swatches as you like within a single theme. In the future ThemeRoller tool, you will be able to add new swatches through an easy-to-use web interface. Until then, you can add new swatches manually by copying the block of theme style rules for an existing swatch, renaming the rules a new letter (e) and changing colors.
-
You can then you can reference the new theme by adding the data-theme="e" attribute to your markup. If you set a theme swatch letter, the framework simply applies classes that include the letter you specify so it's critical that your active theme file include rules for the letters specified in your markup.
+
You can then you can reference the new theme by adding the data-theme="c" attribute to your markup. If you set a theme swatch letter, the framework simply applies classes that include the letter you specify so it's critical that your active theme file include rules for the letters specified in your markup.
diff --git a/docs/toolbars/api-bars.html b/docs/toolbars/api-bars.html
index ff55854f..08743005 100755
--- a/docs/toolbars/api-bars.html
+++ b/docs/toolbars/api-bars.html
@@ -2,8 +2,8 @@
jQuery Mobile Docs - Toolbars
-
-
+
+
diff --git a/docs/toolbars/bars-fixed.html b/docs/toolbars/bars-fixed.html
index 51d55270..af46fc4d 100755
--- a/docs/toolbars/bars-fixed.html
+++ b/docs/toolbars/bars-fixed.html
@@ -2,8 +2,8 @@
jQuery Mobile Framework - Toolbars demo
-
-
+
+
diff --git a/docs/toolbars/bars-fullscreen.html b/docs/toolbars/bars-fullscreen.html
index 49209fd1..707bd632 100755
--- a/docs/toolbars/bars-fullscreen.html
+++ b/docs/toolbars/bars-fullscreen.html
@@ -2,8 +2,8 @@
jQuery Mobile Framework - Fixed toolbars variation
-
-
+
+
diff --git a/docs/toolbars/bars-inline.html b/docs/toolbars/bars-inline.html
index 2dd5a7ec..ccf0a079 100755
--- a/docs/toolbars/bars-inline.html
+++ b/docs/toolbars/bars-inline.html
@@ -2,8 +2,8 @@
jQuery Mobile Framework - Toolbars demo
-
-
+
+
diff --git a/docs/toolbars/bars-themes.html b/docs/toolbars/bars-themes.html
index ca0d9454..d1fd2f93 100755
--- a/docs/toolbars/bars-themes.html
+++ b/docs/toolbars/bars-themes.html
@@ -2,8 +2,8 @@
jQuery Mobile Framework - Toolbars demo
-
-
+
+
diff --git a/docs/toolbars/docs-bars.html b/docs/toolbars/docs-bars.html
index 7c3213e8..79e4c2cf 100755
--- a/docs/toolbars/docs-bars.html
+++ b/docs/toolbars/docs-bars.html
@@ -2,8 +2,8 @@
jQuery Mobile Docs - Toolbars
-
-
+
+
diff --git a/docs/toolbars/docs-footers.html b/docs/toolbars/docs-footers.html
index 0cd5744e..3b81b00b 100755
--- a/docs/toolbars/docs-footers.html
+++ b/docs/toolbars/docs-footers.html
@@ -2,8 +2,8 @@
jQuery Mobile Docs - Toolbars
-
-
+
+
diff --git a/docs/toolbars/docs-headers.html b/docs/toolbars/docs-headers.html
index eca90bc4..20021b30 100755
--- a/docs/toolbars/docs-headers.html
+++ b/docs/toolbars/docs-headers.html
@@ -2,8 +2,8 @@
jQuery Mobile Docs - Toolbars
-
-
+
+
diff --git a/docs/toolbars/docs-navbars.html b/docs/toolbars/docs-navbars.html
index 46ae8816..b188eac2 100755
--- a/docs/toolbars/docs-navbars.html
+++ b/docs/toolbars/docs-navbars.html
@@ -2,8 +2,8 @@
jQuery Mobile Docs - Toolbars
-
-
+
+
diff --git a/docs/toolbars/footer-persist-result.html b/docs/toolbars/footer-persist-result.html
index 702e493d..79e0a62e 100755
--- a/docs/toolbars/footer-persist-result.html
+++ b/docs/toolbars/footer-persist-result.html
@@ -2,8 +2,8 @@
jQuery Mobile Framework - Persistent footer demo
-
-
+
+
diff --git a/docs/toolbars/footer-persist.html b/docs/toolbars/footer-persist.html
index 387386cb..3e8c6b12 100755
--- a/docs/toolbars/footer-persist.html
+++ b/docs/toolbars/footer-persist.html
@@ -2,8 +2,8 @@
jQuery Mobile Framework - Persistent footer demo
-
-
+
+
diff --git a/docs/toolbars/index.html b/docs/toolbars/index.html
index 8877963e..1fbfbf3a 100755
--- a/docs/toolbars/index.html
+++ b/docs/toolbars/index.html
@@ -2,8 +2,8 @@
jQuery Mobile Docs - Toolbars
-
-
+
+
diff --git a/docs/toolbars/navbar.html b/docs/toolbars/navbar.html
index e6035f7b..70f26ffe 100755
--- a/docs/toolbars/navbar.html
+++ b/docs/toolbars/navbar.html
@@ -2,8 +2,8 @@
jQuery Mobile Framework - navbar Example
-
-
+
+
diff --git a/js/jquery.mobile.buttonMarkup.js b/js/jquery.mobile.buttonMarkup.js
index 37057a82..69fffcc0 100644
--- a/js/jquery.mobile.buttonMarkup.js
+++ b/js/jquery.mobile.buttonMarkup.js
@@ -15,12 +15,12 @@ $.fn.buttonMarkup = function( options ){
if(el.is('[data-theme]')){
return el.attr('data-theme');
}
- //if not, find closest theme container
- if(el.parents('body').length){
- var themedParent = el.closest('[class*=ui-bar-],[class*=ui-body-],[class*=ui-list-]');
- return themedParent.length ? themedParent.attr('class').match(/ui-(bar|body|list)-([a-z])/)[2] : 'c';
+ //if not, try to find closest theme container
+ else if( el.parents('body').length ) {
+ var themedParent = el.closest('[class*=ui-bar-],[class*=ui-body-]');
+ return themedParent.length ? themedParent.attr('class').match(/ui-(bar|body)-([a-z])/)[2] : 'c';
}
- else {
+ else{
return 'c';
}
})(),
diff --git a/js/jquery.mobile.controlGroup.js b/js/jquery.mobile.controlGroup.js
index f9f1f14a..9af79122 100644
--- a/js/jquery.mobile.controlGroup.js
+++ b/js/jquery.mobile.controlGroup.js
@@ -6,12 +6,12 @@
*/
(function($){
$.fn.controlgroup = function(options){
- var o = $.extend({
+
+ return $(this).each(function(){
+ var o = $.extend({
direction: $( this ).data( "type" ) || "vertical",
shadow: false
},options);
-
- return $(this).each(function(){
var groupheading = $(this).find('>legend'),
flCorners = o.direction == 'horizontal' ? ['ui-corner-left', 'ui-corner-right'] : ['ui-corner-top', 'ui-corner-bottom'],
type = $(this).find('input:eq(0)').attr('type');
diff --git a/js/jquery.mobile.fixHeaderFooter.js b/js/jquery.mobile.fixHeaderFooter.js
index 6695b54c..065203d7 100644
--- a/js/jquery.mobile.fixHeaderFooter.js
+++ b/js/jquery.mobile.fixHeaderFooter.js
@@ -18,7 +18,7 @@ $.fixedToolbars = (function(){
var currentstate = 'inline',
delayTimer,
ignoreTargets = 'a,input,textarea,select,button,label,.ui-header-fixed,.ui-footer-fixed',
- toolbarSelector = '.ui-page-active .ui-header-fixed, .ui-page-active .ui-footer-fixed:not(.ui-footer-duplicate)',
+ toolbarSelector = '.ui-header-fixed, .ui-footer-fixed:not(.ui-footer-duplicate)', //removed scope temporarily - these used to be scoped to ui-page-active
stickyFooter, //for storing quick references to duplicate footers
supportTouch = $.support.touch,
touchStartEvent = supportTouch ? "touchstart" : "mousedown",
diff --git a/js/jquery.mobile.listview.js b/js/jquery.mobile.listview.js
index 3735ba6c..c625304b 100644
--- a/js/jquery.mobile.listview.js
+++ b/js/jquery.mobile.listview.js
@@ -8,8 +8,8 @@
$.widget( "mobile.listview", $.mobile.widget, {
options: {
- theme: "f",
- countTheme: "f",
+ theme: "c",
+ countTheme: "c",
headerTheme: "b",
dividerTheme: "b",
splitTheme: "b",
diff --git a/js/jquery.mobile.page.js b/js/jquery.mobile.page.js
index 1d29957b..48aec644 100644
--- a/js/jquery.mobile.page.js
+++ b/js/jquery.mobile.page.js
@@ -18,10 +18,8 @@ $.widget( "mobile.page", $.mobile.widget, {
this.element.find( "[data-role=nojs]" ).addClass( "ui-nojs" );
this._enchanceControls();
-
- //links in bars, or those with data-role become buttons
- this.element.find( "[data-role=button], .ui-bar a" ).not( ".ui-btn" ).buttonMarkup();
+ //pre-find data els
var $dataEls = this.element.find( "[data-role]" ).andSelf().each(function() {
var $this = $( this ),
role = $this.data( "role" ),
@@ -64,8 +62,6 @@ $.widget( "mobile.page", $.mobile.widget, {
.prependTo( $this );
}
- $this.children( "a" ).buttonMarkup();
-
//page title
$this.children( ":header" )
.addClass( "ui-title" )
@@ -98,16 +94,22 @@ $.widget( "mobile.page", $.mobile.widget, {
case "ajaxform":
$this[ role ]();
break;
- case "controlgroup":
- // FIXME for some reason this has to come before the form control stuff (see above)
- $this.controlgroup();
- break;
}
});
+ //links in bars, or those with data-role become buttons
+ this.element.find( "[data-role=button], .ui-bar a, .ui-header a, .ui-footer a" )
+ .not( ".ui-btn" )
+ .buttonMarkup();
+
+
+ this.element
+ .find('[data-role="controlgroup"]')
+ .controlgroup();
+
//links within content areas
this.element.find( ".ui-body a:not(.ui-btn):not(.ui-link-inherit)" )
- .addClass( "ui-link" );
+ .addClass( "ui-link" );
//fix toolbars
this.element.fixHeaderFooter();