Hopiu/jquery-mobile
1
0
Fork 0
mirror of https://github.com/Hopiu/jquery-mobile.git synced 2026-05-22 05:11:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hide address bar during page changes by catching ajax clicks early through binding to touchend, and make pages fit screen height during transitions

Browse source
This commit is contained in:
scottjehl 2011-06-15 20:15:28 -04:00
parent d636421f95
commit ed7aae1d1c
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
js/jquery.mobile.navigation.js
View file

@ -385,20 +385,26 @@
//function for transitioning between two existing pages //function for transitioning between two existing pages
function transitionPages( toPage, fromPage, transition, reverse ) { function transitionPages( toPage, fromPage, transition, reverse ) {
$.mobile.silentScroll();
//get current scroll distance //get current scroll distance
var currScroll = $window.scrollTop(); var currScroll = $window.scrollTop(),
toScroll = toPage.data( "lastScroll" ) || 0;
$.mobile.silentScroll();
if( fromPage ) { if( fromPage ) {
//set as data for returning to that spot //set as data for returning to that spot
fromPage fromPage
.height( screen.height )
.jqmData( "lastScroll", currScroll ) .jqmData( "lastScroll", currScroll )
.jqmData( "lastClicked", $activeClickedLink ); .jqmData( "lastClicked", $activeClickedLink );
//trigger before show/hide events //trigger before show/hide events
fromPage.data( "page" )._trigger( "beforehide", null, { nextPage: toPage } ); fromPage.data( "page" )._trigger( "beforehide", null, { nextPage: toPage } );
} }
toPage.data( "page" )._trigger( "beforeshow", null, { prevPage: fromPage || $( "" ) } ); toPage
.height( toScroll )
.data( "page" )._trigger( "beforeshow", null, { prevPage: fromPage || $( "" ) } );
//clear page loader //clear page loader
$.mobile.hidePageLoadingMsg(); $.mobile.hidePageLoadingMsg();
@ -416,10 +422,10 @@
//trigger show/hide events //trigger show/hide events
if( fromPage ) { if( fromPage ) {
fromPage.data( "page" )._trigger( "hide", null, { nextPage: toPage } ); fromPage.width("").height("").data( "page" )._trigger( "hide", null, { nextPage: toPage } );
} }
//trigger pageshow, define prevPage as either fromPage or empty jQuery obj //trigger pageshow, define prevPage as either fromPage or empty jQuery obj
toPage.data( "page" )._trigger( "show", null, { prevPage: fromPage || $( "" ) } ); toPage.width("").height("").data( "page" )._trigger( "show", null, { prevPage: fromPage || $( "" ) } );
}); });
@ -952,9 +958,8 @@
} }
}); });
//click routing - direct to HTTP or Ajax, accordingly //click routing - direct to HTTP or Ajax, accordingly
$( document ).bind( "click", function( event ) { $( document ).bind( "vclick click", function( event ) {
var link = findClosestLink( event.target ); var link = findClosestLink( event.target );
if ( !link ) { if ( !link ) {
return; return;