Merge branch 'master' of github.com:jquery/jquery-mobile

This commit is contained in:
scottjehl 2010-10-06 10:11:18 -04:00
commit 651aee991c
2 changed files with 3 additions and 2 deletions

View file

@ -136,6 +136,7 @@ $.fn.customSelect = function(options){
//back button
listbox.find('.ui-listbox-header a').click(function(){
select.trigger('hidemenu');
return false;
});

View file

@ -334,9 +334,9 @@
//add back buttons to headers that don't have them
// FIXME make that optional?
// TODO don't do that on devices that have a native back button?
var backBtn = $el.find('.ui-header a.ui-back');
var backBtn = $el.find('.ui-header:not(.ui-listbox-header) a.ui-back');
if(!backBtn.length){
backBtn = jQuery('<a href="#" class="ui-back" data-icon="arrow-l"></a>').appendTo($el.find('.ui-header'));
backBtn = jQuery('<a href="#" class="ui-back" data-icon="arrow-l"></a>').appendTo($el.find('.ui-header:not(.ui-listbox-header)'));
}
//buttons from links in headers,footers,bars, or with data-role