Skip to content
This repository
Browse code

[popup] Add hashListeningEnabled to the intersection that establishes…

… whether we will use history or not
  • Loading branch information...
commit 8cdc71591b42207289c1888ff0614524f0d590c3 1 parent 5a02567
Gabriel "_|Nix|_" Schulhof authored September 20, 2012

Showing 1 changed file with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. 4  js/widgets/popup.js
4  js/widgets/popup.js
@@ -153,7 +153,7 @@ define( [ "jquery",
153 153
 			// We need to adjust the history option to be false if there's no AJAX nav.
154 154
 			// We can't do it in the option declarations because those are run before
155 155
 			// it is determined whether there shall be AJAX nav.
156  
-			this.options.history = this.options.history && $.mobile.ajaxEnabled; 
  156
+			this.options.history = this.options.history && $.mobile.ajaxEnabled && $.mobile.hashListeningEnabled;
157 157
 
158 158
 			if ( thisPage.length === 0 ) {
159 159
 				thisPage = $( "body" );
@@ -702,7 +702,7 @@ define( [ "jquery",
702 702
 
703 703
 			// if history alteration is disabled close on navigate events
704 704
 			// and leave the url as is
705  
-			if( !( opts.history && $.mobile.hashListeningEnabled ) ) {
  705
+			if( !( opts.history ) ) {
706 706
 				self._open( options );
707 707
 				self._bindContainerClose();
708 708
 

0 notes on commit 8cdc715

Please sign in to comment.
Something went wrong with that request. Please try again.