Permalink
Browse files

[popup] Add hashListeningEnabled to the intersection that establishes…

… whether we will use history or not
  • Loading branch information...
1 parent 5a02567 commit 8cdc71591b42207289c1888ff0614524f0d590c3 @gabrielschulhof gabrielschulhof committed Sep 20, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 js/widgets/popup.js
View
4 js/widgets/popup.js
@@ -153,7 +153,7 @@ define( [ "jquery",
// We need to adjust the history option to be false if there's no AJAX nav.
// We can't do it in the option declarations because those are run before
// it is determined whether there shall be AJAX nav.
- this.options.history = this.options.history && $.mobile.ajaxEnabled;
+ this.options.history = this.options.history && $.mobile.ajaxEnabled && $.mobile.hashListeningEnabled;
if ( thisPage.length === 0 ) {
thisPage = $( "body" );
@@ -702,7 +702,7 @@ define( [ "jquery",
// if history alteration is disabled close on navigate events
// and leave the url as is
- if( !( opts.history && $.mobile.hashListeningEnabled ) ) {
+ if( !( opts.history ) ) {
self._open( options );
self._bindContainerClose();

0 comments on commit 8cdc715

Please sign in to comment.