Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

check the url saved on the page element in the history stack to avoid…

… checking agains the dialog nonsense url Fixes #1433
  • Loading branch information...
commit 59bd1400adf752b2f5b3e9a8050ad03546728232 1 parent 093d3b1
@johnbender johnbender authored
Showing with 5 additions and 3 deletions.
  1. +5 −3 js/jquery.mobile.navigation.js
View
8 js/jquery.mobile.navigation.js
@@ -332,7 +332,7 @@
type = 'get',
isFormRequest = false,
duplicateCachedPage = null,
- currPage = urlHistory.getActive(),
+ active = urlHistory.getActive(),
back = false,
forward = false,
pageTitle = document.title;
@@ -341,7 +341,9 @@
// If we are trying to transition to the same page that we are currently on ignore the request.
// an illegal same page request is defined by the current page being the same as the url, as long as there's history
// and to is not an array or object (those are allowed to be "same")
- if( currPage && urlHistory.stack.length >= 1 && currPage.url === url && !toIsArray && !toIsObject ) {
+ if( urlHistory.stack.length > 0
+ && active.page.jqmData("url") === url
+ && !toIsArray && !toIsObject ) {
return;
}
else if(isPageTransitioning) {
@@ -359,7 +361,7 @@
isBack: function(){
forward = !(back = true);
reverse = true;
- transition = transition || currPage.transition;
+ transition = transition || active.transition;
},
isForward: function(){
forward = !(back = false);
Please sign in to comment.
Something went wrong with that request. Please try again.