fix up the page heights during transitions, and min-heights otherwise.

This commit is contained in:
scottjehl 2011-06-16 19:10:50 -04:00
parent ed7aae1d1c
commit df7ac2f642
2 changed files with 6 additions and 6 deletions

View file

@ -403,7 +403,7 @@
fromPage.data( "page" )._trigger( "beforehide", null, { nextPage: toPage } );
}
toPage
.height( toScroll )
.height( screen.height )
.data( "page" )._trigger( "beforeshow", null, { prevPage: fromPage || $( "" ) } );
//clear page loader
@ -422,15 +422,15 @@
//trigger show/hide events
if( fromPage ) {
fromPage.width("").height("").data( "page" )._trigger( "hide", null, { nextPage: toPage } );
fromPage.height("").data( "page" )._trigger( "hide", null, { nextPage: toPage } );
}
//trigger pageshow, define prevPage as either fromPage or empty jQuery obj
toPage.width("").height("").data( "page" )._trigger( "show", null, { prevPage: fromPage || $( "" ) } );
toPage.height("").data( "page" )._trigger( "show", null, { prevPage: fromPage || $( "" ) } );
});
return promise;
}
};
//shared page enhancements
function enhancePage( $page, role ) {

View file

@ -19,9 +19,9 @@
/*orientations from js are available */
.portrait,
.portrait .ui-page,
.portrait .ui-page { min-height: 420px; }
.landscape,
.landscape .ui-page { min-height: 100%; }
.landscape .ui-page { min-height: 300px; }
/* loading screen */
.ui-loading .ui-mobile-viewport { overflow: hidden !important; }