From e59b5f2fa6217881ca5128c73b8c5c4b67ca2f2b Mon Sep 17 00:00:00 2001 From: Jasper de Groot Date: Thu, 8 Nov 2012 12:54:14 -0800 Subject: [PATCH] Merge pull request #5262 from arschmitz/issue-5261 fixedToolbar: added logic to set page padding back to 0 on destroy. Fixe... --- js/widgets/fixedToolbar.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/js/widgets/fixedToolbar.js b/js/widgets/fixedToolbar.js index 282a61a9fd0..769ebda2d13 100644 --- a/js/widgets/fixedToolbar.js +++ b/js/widgets/fixedToolbar.js @@ -255,8 +255,12 @@ define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.core", "../jque }, destroy: function() { - this.element.removeClass( "ui-header-fixed ui-footer-fixed ui-header-fullscreen ui-footer-fullscreen in out fade slidedown slideup ui-fixed-hidden" ); - this.element.closest( ".ui-page" ).removeClass( "ui-page-header-fixed ui-page-footer-fixed ui-page-header-fullscreen ui-page-footer-fullscreen" ); + var $el = this.element, + header = $el.is( ".ui-header" ); + + $el.closest( ".ui-page" ).css( "padding-" + ( header ? "top" : "bottom" ), "" ); + $el.removeClass( "ui-header-fixed ui-footer-fixed ui-header-fullscreen ui-footer-fullscreen in out fade slidedown slideup ui-fixed-hidden" ); + $el.closest( ".ui-page" ).removeClass( "ui-page-header-fixed ui-page-footer-fixed ui-page-header-fullscreen ui-page-footer-fullscreen" ); } });