[popup] When destroying a popup, run close() before un-enhancing if it is the currently active popup -- Fixes #5123

Author: Gabriel Schulhof

js/widgets/popup.js

@@ -654,12 +654,9 @@ define( [ "jquery",
 			});
 		},
 
-		_destroy: function() {
+		_unenhance: function() {
 			var self = this;
 
-			// hide and remove bindings
-			self._close();
-
 			// Put the element back to where the placeholder was and remove the "ui-popup" class
 			self._setTheme( "none" );
 			self.element
@@ -677,6 +674,15 @@ define( [ "jquery",
 			});
 		},
 
+		_destroy: function() {
+			if ( $.mobile.popup.active === this ) {
+				this.element.one( "popupafterclose", $.proxy( this, "_unenhance" ) );
+				this.close();
+			} else {
+				this._unenhance();
+			}
+		},
+
 		// any navigation event after a popup is opened should close the popup
 		// NOTE the pagebeforechange is bound to catch navigation events that don't
 		//      alter the url (eg, dialogs from popups)