Hopiu/jquery-mobile
1
0
Fork 0
mirror of https://github.com/Hopiu/jquery-mobile.git synced 2026-03-16 22:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

added "inline" option to buttons and button links. data-inline="true". Fixes #148

Browse source
This commit is contained in:
scottjehl 2010-10-11 15:47:30 -04:00
parent 3f748dc1b9
commit a26e0a0d6a
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
css/jquery.mobile.button.css
View file

@ -4,7 +4,7 @@
* Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
*/
.ui-btn { display: block; text-align: center; cursor:pointer; position: relative; margin: .5em 5px; padding: 0; }
.ui-header .ui-btn, .ui-bar .ui-btn { display: inline-block; font-size: 13px; margin: 0; }
.ui-header .ui-btn, .ui-bar .ui-btn, .ui-btn-inline { display: inline-block; font-size: 13px; margin: 0; }
.ui-btn-inner { padding: .6em 25px; display: block; height: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; }
.ui-btn-text { }
.ui-header .ui-btn-inner, .ui-footer .ui-btn-inner, .ui-bar .ui-btn-inner { padding: .4em 8px .5em; }

9
js/jquery.mobile.buttonMarkup.js
View file

@ -24,8 +24,9 @@ $.fn.buttonMarkup = function( options ){
return 'c';
}
})(),
iconpos: el.attr('data-iconpos'),
icon: el.attr('data-icon')
iconpos: el.data('iconpos'),
icon: el.data('icon'),
inline: el.data('inline')
}, $.fn.buttonMarkup.defaults, options),
// Classes Defined
@ -33,6 +34,10 @@ $.fn.buttonMarkup = function( options ){
innerClass = "ui-btn-inner",
iconClass;
if( o.inline ){
buttonClass += " ui-btn-inline";
}
if (o.icon) {
o.icon = 'ui-icon-' + o.icon;

7
js/jquery.mobile.forms.button.js
View file

@ -10,7 +10,12 @@ $.fn.customButton = function(){
var button = $(this).addClass('ui-btn-hidden').attr('tabindex','-1');
//add ARIA role
$('<a href="#" role="button">'+ (button.text() || button.val()) +'</a>')
.buttonMarkup({theme: button.attr('data-theme'), icon: button.attr('data-icon')})
.buttonMarkup({
theme: button.data('theme'),
icon: button.data('icon'),
iconpos: button.data('iconpos'),
inline: button.data('inline')
})
.click(function(){
button.click();
return false;