Merge remote branch 'origin/master'

This commit is contained in:
scottjehl 2011-08-05 11:05:32 -04:00
commit f78970618c

View file

@ -79,7 +79,9 @@ $( ":jqmData(role='page'), :jqmData(role='dialog')" ).live( "pagecreate", functi
} else if ( role === "content" ) {
$this.addClass( "ui-body-" + ( theme || pageTheme || o.contentTheme ) );
if (theme || o.contentTheme) {
$this.addClass( "ui-body-" + ( theme || o.contentTheme ) );
}
// Add ARIA role
$this.attr( "role", "main" );