[dialog] When hash listening is disabled and going to the previous page during close, correctly construct the URL for the previous page from the urlHistory entry and indicate that changePage is to go back in urlHistory rather than adding a new entry

Gabriel Schulhof · Gabriel Schulhof · commit 5048242ea380 · 2012-07-05T15:18:36.000+03:00
diff --git a/js/widgets/dialog.js b/js/widgets/dialog.js
@@ -83,13 +83,20 @@ $.widget( "mobile.dialog", $.mobile.widget, {
 
 	// Close method goes back in history
 	close: function() {
+		var dst;
+
 		if ( !this._isClosed ) {
 			this._isClosed = true;
 			if ( $.mobile.hashListeningEnabled ) {
 				window.history.back();
 			}
 			else {
-				$.mobile.changePage( $.mobile.urlHistory.getPrev().url );
+				dst = $.mobile.urlHistory.getPrev().url;
+				if ( !$.mobile.path.isPath( dst ) ) {
+					dst = $.mobile.path.makeUrlAbsolute( "#" + dst );
+				}
+
+				$.mobile.changePage( dst, { changeHash: false, fromHashChange: true } );
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -83,13 +83,20 @@ $.widget( "mobile.dialog", $.mobile.widget, {`
`83`	`83`
`84`	`84`	`// Close method goes back in history`
`85`	`85`	`close: function() {`
	`86`	`+ var dst;`
	`87`	`+`
`86`	`88`	`if ( !this._isClosed ) {`
`87`	`89`	`this._isClosed = true;`
`88`	`90`	`if ( $.mobile.hashListeningEnabled ) {`
`89`	`91`	`window.history.back();`
`90`	`92`	`}`
`91`	`93`	`else {`
`92`		`- $.mobile.changePage( $.mobile.urlHistory.getPrev().url );`
	`94`	`+ dst = $.mobile.urlHistory.getPrev().url;`
	`95`	`+ if ( !$.mobile.path.isPath( dst ) ) {`
	`96`	`+ dst = $.mobile.path.makeUrlAbsolute( "#" + dst );`
	`97`	`+ }`
	`98`	`+`
	`99`	`+ $.mobile.changePage( dst, { changeHash: false, fromHashChange: true } );`
`93`	`100`	`}`
`94`	`101`	`}`
`95`	`102`	`}`