Skip to content
This repository has been archived by the owner on Oct 8, 2021. It is now read-only.

Commit

Permalink
Revert "Revert "[popup] Perform the visual open only when the nav hoo…
Browse files Browse the repository at this point in the history
…k has been acquired -- Fixes #4949""

This reverts commit 7c98460.
  • Loading branch information
Gabriel Schulhof committed Sep 7, 2012
1 parent 5541ca9 commit f4f269b
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions js/widgets/popup.js
Expand Up @@ -514,8 +514,6 @@ define( [ "jquery",
}
return false;
}());
// set the global popup mutex
$.mobile.popup.active = this;

// Make sure options is defined
options = ( options || {} );
Expand Down Expand Up @@ -680,8 +678,8 @@ define( [ "jquery",
return;
}

// forward the options on to the visual open
self._open( options );
// set the global popup mutex
$.mobile.popup.active = this;

// if history alteration is disabled close on navigate events
// and leave the url as is
Expand Down Expand Up @@ -723,6 +721,9 @@ define( [ "jquery",
opts.container.one( opts.navigateEvents, function( e ) {
e.preventDefault();
self._bindContainerClose();

// forward the options on to the visual open
self._open( options );
});

// Gotta love methods with 1mm args :(
Expand Down

0 comments on commit f4f269b

Please sign in to comment.