Permalink
Browse files

Fix for issue 1833 - No page transition used when hitting the browser…

… forward button

- Don't use the transition of the initial page on the stack.
  • Loading branch information...
1 parent ca4428c commit d2f115349acfd32878725a980b861e9b892b06eb @jblas jblas committed Jun 15, 2011
Showing with 2 additions and 1 deletion.
  1. +2 −1 js/jquery.mobile.navigation.js
@@ -766,6 +766,7 @@
url = toPage.jqmData( "url" ),
fileUrl = path.getFilePath( url ),
active = urlHistory.getActive(),
+ activeIsInitialPage = urlHistory.activeIndex === 0,
historyDir = 0,
pageTitle = document.title,
isDialog = settings.role === "dialog" || toPage.jqmData( "role" ) === "dialog";
@@ -839,7 +840,7 @@
// Make sure we have a transition defined.
settings.transition = settings.transition
- || ( historyDir ? active.transition : undefined )
+ || ( ( historyDir && !activeIsInitialPage ) ? active.transition : undefined )
|| ( settings.role === "dialog" ? $.mobile.defaultDialogTransition : $.mobile.defaultPageTransition );
// If we're navigating back in the URL history, set reverse accordingly.

0 comments on commit d2f1153

Please sign in to comment.