[popup] Popup stack management

Author: Gabriel Schulhof

js/jquery.mobile.popup.js

@@ -319,30 +319,53 @@ define( [ "jquery",
 				var self = this;
 
 				self.element.one( "opened", function() {
-					self._doNavHook();
+					if ( $.mobile.popup.currentPopup ) {
+						self._prev = $.mobile.popup.currentPopup;
+						$.mobile.popup.currentPopup._next = self;
+					}
+					else {
+						self._doNavHook();
+					}
 					$.mobile.popup.currentPopup = self;
 				});
 
-				if ( $.mobile.popup.currentPopup ) {
-					$.mobile.popup.currentPopup.element.one( "closed", function() {
-						self._realOpen( x, y );
-					});
-					$.mobile.popup.currentPopup.close();
-				}
-				else {
-					self._realOpen( x, y );
-				}
+				this.element.one( "closed", function() {
+					if ( self._prev ) {
+						self._prev._next = self._next;
+					}
+
+					if ( self._next ) {
+						self._next._prev = self._prev;
+					}
+
+					if ( self === $.mobile.popup.currentPopup ) {
+						$.mobile.popup.currentPopup = self._prev;
+					}
+
+					if ( !$.mobile.popup.currentPopup ) {
+						self._undoNavHook();
+					}
+				});
+
+				this._realOpen(x, y);
 			}
 		},
 
 		close: function() {
 			if ( this._isOpen ) {
-				window.history.back();
+				if ( $.mobile.popup.currentPopup === this && !this._prev ) {
+					window.history.back();
+				}
+				else {
+					this._realClose();
+				}
 			}
 		},
 
 		_onHashChange: function() {
-			this._realClose();
+			for ( var popup = $.mobile.popup.currentPopup ; popup ; popup = popup._prev ) {
+				popup._realClose();
+			}
 		}
 	});