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

added page tracking to history stack and handling for dialog to dialog transitions in hashchange

Browse source
This commit is contained in:
John Bender 2011-03-27 23:59:28 -07:00
parent ee02a76279
commit 97783bdbd1
1 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -105,13 +105,13 @@
},
// addNew is used whenever a new page is added
addNew: function( url, transition ){
addNew: function( url, transition, storedTo ){
//if there's forward history, wipe it
if( urlHistory.getNext() ){
urlHistory.clearForward();
}
urlHistory.stack.push( {url : url, transition: transition } );
urlHistory.stack.push( {url : url, transition: transition, page: storedTo } );
urlHistory.activeIndex = urlHistory.stack.length - 1;
},
@ -402,7 +402,7 @@
//add page to history stack if it's not back or forward
if( !back && !forward ){
urlHistory.addNew( url, transition );
urlHistory.addNew( url, transition, to );
}
removeActiveLinkClass();
@ -764,20 +764,29 @@
return;
}
// special case for dialogs requires heading back or forward until we find a non dialog page
// special case for dialogs
if( urlHistory.stack.length > 1 &&
to.indexOf( dialogHashKey ) > -1 &&
!$.mobile.activePage.is( ".ui-dialog" ) ){
to.indexOf( dialogHashKey ) > -1 ){
//determine if we're heading forward or backward and continue accordingly past
//the current dialog
urlHistory.directHashChange({
currentUrl: to,
isBack: function(){ window.history.back(); },
isForward: function(){ window.history.forward(); }
});
// If current active page is not a dialog skip the dialog and continue
// in the same direction
if(!$.mobile.activePage.is( ".ui-dialog" )) {
//determine if we're heading forward or backward and continue accordingly past
//the current dialog
urlHistory.directHashChange({
currentUrl: to,
isBack: function(){ window.history.back(); },
isForward: function(){ window.history.forward(); }
});
return;
// prevent changepage
return;
} else {
var setTo = function(){ to = $.mobile.urlHistory.getActive().page; };
// if the current active page is a dialog and we're navigating
// to a dialog use the dialog objected saved in the stack
urlHistory.directHashChange({ currentUrl: to, isBack: setTo, isForward: setTo });
}
}
//if to is defined, load it