Merge remote branch 'origin/master'

This commit is contained in:
scottjehl 2011-01-20 16:28:28 -05:00
commit bfa6f6a3af

View file

@ -69,9 +69,10 @@ $.fixedToolbars = (function(){
//before page is shown, check for duplicate footer
$('.ui-page').live('pagebeforeshow', function(event, ui){
var page = $(event.target);
var footer = page.find('[data-role="footer"]:not(.ui-sticky-footer)');
var id = footer.data('id');
var page = $(event.target),
footer = page.find('[data-role="footer"]:not(.ui-sticky-footer)'),
id = footer.data('id');
stickyFooter = null;
if (id)
{
stickyFooter = $('.ui-footer[data-id="' + id + '"].ui-sticky-footer');