Popup: Do not proceed with _closePopup() if the popup is no longer the currently-open one. Fixes #6182.

Gabriel Schulhof · Gabriel Schulhof · commit 9da71a49841d · 2013-07-17T13:04:53.000+03:00
diff --git a/js/widgets/popup.js b/js/widgets/popup.js
@@ -758,7 +758,7 @@ $.widget( "mobile.popup", {
 	_closePopup: function( evt, data ) {
 		var parsedDst, toUrl, opts = this.options, immediate = false;
 
-		if ( evt && evt.isDefaultPrevented() ) {
+		if ( ( evt && evt.isDefaultPrevented() ) || $.mobile.popup.active !== this ) {
 			return;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -758,7 +758,7 @@ $.widget( "mobile.popup", {`
`758`	`758`	`_closePopup: function( evt, data ) {`
`759`	`759`	`var parsedDst, toUrl, opts = this.options, immediate = false;`
`760`	`760`
`761`		`- if ( evt && evt.isDefaultPrevented() ) {`
	`761`	`+ if ( ( evt && evt.isDefaultPrevented() ) \|\| $.mobile.popup.active !== this ) {`
`762`	`762`	`return;`
`763`	`763`	`}`
`764`	`764`