Skip to content
This repository was archived by the owner on Oct 8, 2021. It is now read-only.

Fixes #3998 - All buttons, regardless of markup, should be mini by default in toolbars #4363

Merged
scottjehl merged 6 commits into from
May 21, 2012
Merged

Fixes #3998 - All buttons, regardless of markup, should be mini by default in toolbars #4363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
315a060
Excluded button element from buttonMarkup auto initialization
jaspermdegroot May 4, 2012
fc8738a
Added rules for ui-btn-block in header and footer
jaspermdegroot May 4, 2012
a618f80
Fixes #3998 - Make button elements default to mini in header and footer
jaspermdegroot May 4, 2012
bd02a42
Excluded input element from buttonMarkup auto initialization
jaspermdegroot May 6, 2012
e0872f3
keep posibility to set inline and focus options programmatically
jaspermdegroot May 17, 2012
7484654
update allow to override default inline and mini styling in header an…
jaspermdegroot May 17, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions css/structure/jquery.mobile.button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@

.ui-header .ui-btn,
.ui-footer .ui-btn { display: inline-block; margin: 0; }
.ui-header .ui-btn-block,
.ui-footer .ui-btn-block { display: block; margin: .25em 5px; }
.ui-header .ui-btn-block.ui-fullsize,
.ui-footer .ui-btn-block.ui-fullsize { margin: .5em 5px; }

.ui-header .ui-btn-inner,
.ui-footer .ui-btn-inner,
Expand Down
10 changes: 4 additions & 6 deletions js/jquery.mobile.buttonMarkup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,19 @@ $.fn.buttonMarkup = function( options ) {
}

buttonClass = "ui-btn ui-btn-up-" + o.theme;
buttonClass += o.inline ? " ui-btn-inline" : "";
buttonClass += o.shadow ? " ui-shadow" : "";
buttonClass += o.corners ? " ui-btn-corner-all" : "";

if ( o.mini !== undefined ) {
// Used to control styling in headers/footers, where buttons default to `mini` style.
buttonClass += o.mini ? " ui-mini" : " ui-fullsize";
buttonClass += o.mini === true ? " ui-mini" : " ui-fullsize";
}

if ( o.inline !== undefined ) {
// Used to control styling in headers/footers, where buttons default to `mini` style.
buttonClass += o.inline === false ? " ui-btn-block" : " ui-btn-inline";
// Used to control styling in headers/footers, where buttons default to `inline` style.
buttonClass += o.inline === true ? " ui-btn-inline" : " ui-btn-block";
}


if ( o.icon ) {
o.icon = "ui-icon-" + o.icon;
o.iconpos = o.iconpos || "left";
Expand Down Expand Up @@ -241,7 +239,7 @@ var attachEvents = function() {
$( document ).bind( "pagecreate create", function( e ){

$( ":jqmData(role='button'), .ui-bar > a, .ui-header > a, .ui-footer > a, .ui-bar > :jqmData(role='controlgroup') > a", e.target )
.not( ".ui-btn, :jqmData(role='none'), :jqmData(role='nojs')" )
.not( "button, input, .ui-btn, :jqmData(role='none'), :jqmData(role='nojs')" )
.buttonMarkup();
});

Expand Down
10 changes: 5 additions & 5 deletions js/jquery.mobile.forms.button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ $.widget( "mobile.button", $.mobile.widget, {
theme: null,
icon: null,
iconpos: null,
inline: false,
corners: true,
shadow: true,
iconshadow: true,
initSelector: "button, [type='button'], [type='submit'], [type='reset'], [type='image']",
mini: false
initSelector: "button, [type='button'], [type='submit'], [type='reset'], [type='image']"
},
_create: function() {
var $el = this.element,
$button,
o = this.options,
type,
name,
inline = o.inline || $el.jqmData( "inline" ),
mini = o.mini || $el.jqmData( "mini" ),
classes = "",
$buttonPlaceholder;

Expand Down Expand Up @@ -61,11 +61,11 @@ $.widget( "mobile.button", $.mobile.widget, {
theme: o.theme,
icon: o.icon,
iconpos: o.iconpos,
inline: o.inline,
inline: inline,
corners: o.corners,
shadow: o.shadow,
iconshadow: o.iconshadow,
mini: o.mini
mini: mini
})
.addClass( classes )
.append( $el.addClass( "ui-btn-hidden" ) );
Expand Down