From d113021dd8ca6ea78c3aff958a36850ce75a4737 Mon Sep 17 00:00:00 2001 From: Nabil Saleh Date: Wed, 20 Apr 2011 15:07:35 +0200 Subject: [PATCH 1/2] Fix for Issue #916 fixed footer did not apear when returning from dialog. --- js/jquery.mobile.fixHeaderFooter.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/jquery.mobile.fixHeaderFooter.js b/js/jquery.mobile.fixHeaderFooter.js index 1d2eea0aae0..d1dde45eeeb 100644 --- a/js/jquery.mobile.fixHeaderFooter.js +++ b/js/jquery.mobile.fixHeaderFooter.js @@ -107,8 +107,9 @@ $.fixedToolbars = (function(){ prevPage = ui.prevPage, prevFooter = prevPage && prevPage.find( ":jqmData(role='footer')" ), prevFooterMatches = prevFooter.length && prevFooter.jqmData( "id" ) === id; + revHasNoFooter=!(prevFooter.length >0); - if( id && prevFooterMatches ){ + if( id && (prevFooterMatches || prevHasNoFooter) ){ stickyFooter = footer; setTop( stickyFooter.removeClass( "fade in out" ).appendTo( $.mobile.pageContainer ) ); } From b8bee6a58da2ecb0cd36bdea32ad0568f1ac169a Mon Sep 17 00:00:00 2001 From: Nabil Saleh Date: Wed, 9 Nov 2011 10:50:56 +0100 Subject: [PATCH 2/2] fixed merge --- js/jquery.mobile.fixHeaderFooter.js | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/js/jquery.mobile.fixHeaderFooter.js b/js/jquery.mobile.fixHeaderFooter.js index 01714591db3..6146e061544 100644 --- a/js/jquery.mobile.fixHeaderFooter.js +++ b/js/jquery.mobile.fixHeaderFooter.js @@ -15,7 +15,7 @@ var slideDownClass = "ui-header-fixed ui-fixed-inline fade", $.fn.fixHeaderFooter = function( options ) { - if ( !$.support.scrollTop ) { + if ( !$.support.scrollTop || ( $.support.touchOverflow && $.mobile.touchOverflowEnabled ) ) { return this; } @@ -37,7 +37,7 @@ $.fn.fixHeaderFooter = function( options ) { // single controller for all showing,hiding,toggling $.mobile.fixedToolbars = (function() { - if ( !$.support.scrollTop ) { + if ( !$.support.scrollTop || ( $.support.touchOverflow && $.mobile.touchOverflowEnabled ) ) { return; } @@ -148,23 +148,7 @@ $.mobile.fixedToolbars = (function() { stateBefore = null; }); - $(window).bind('resize', showEventCallback); - }); - - //before page is shown, check for duplicate footer - $('.ui-page').live('pagebeforeshow', function(event, ui){ - var page = $(event.target), - footer = page.find( ":jqmData(role='footer')" ), - id = footer.data('id'), - prevPage = ui.prevPage, - prevFooter = prevPage && prevPage.find( ":jqmData(role='footer')" ), - prevFooterMatches = prevFooter.length && prevFooter.jqmData( "id" ) === id; - revHasNoFooter=!(prevFooter.length >0); - - if( id && (prevFooterMatches || prevHasNoFooter) ){ - stickyFooter = footer; - setTop( stickyFooter.removeClass( "fade in out" ).appendTo( $.mobile.pageContainer ) ); - } + $window.bind( "resize updatelayout", showEventCallback ); }); // 1. Before page is shown, check for duplicate footer @@ -367,9 +351,6 @@ $.mobile.fixedToolbars = (function() { }; })(); -// TODO - Deprecated namepace on $. Remove in a later release -$.fixedToolbars = $.mobile.fixedToolbars; - //auto self-init widgets $( document ).bind( "pagecreate create", function( event ) { @@ -377,7 +358,7 @@ $( document ).bind( "pagecreate create", function( event ) { $( event.target ).each(function() { - if ( !$.support.scrollTop ) { + if ( !$.support.scrollTop || ( $.support.touchOverflow && $.mobile.touchOverflowEnabled ) ) { return this; }