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

moved global hashchange disable check above dialog check

Browse source
This commit is contained in:
John Bender 2011-03-07 17:23:44 -08:00
parent c9416a09a7
commit 150f0f6c17
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -727,6 +727,14 @@
transition = $.mobile.urlHistory.stack.length === 0 ? false : undefined,
back , forward, newActiveIndex;
//if listening is disabled (either globally or temporarily), or it's a dialog hash
if( !$.mobile.hashListeningEnabled || !urlHistory.ignoreNextHashChange ){
if( !urlHistory.ignoreNextHashChange ){
urlHistory.ignoreNextHashChange = true;
}
return;
}
// special case for dialogs requires heading back or forward until we find a non dialog page
if( urlHistory.stack.length > 1 &&
@ -744,15 +752,6 @@
return;
}
//if listening is disabled (either globally or temporarily), or it's a dialog hash
if( !$.mobile.hashListeningEnabled || !urlHistory.ignoreNextHashChange ){
if( !urlHistory.ignoreNextHashChange ){
urlHistory.ignoreNextHashChange = true;
}
return;
}
//if to is defined, load it
if ( to ){
$.mobile.changePage( to, transition, undefined, false, true );