Navigation: Navigator updates initialHref until initial popstate arrives

Gabriel Schulhof · Gabriel Schulhof · commit 7069e219afd2 · 2015-04-07T13:00:57.000+03:00
Fixes jquery-archivegh-8056 Closes jquery-archivegh-8051
diff --git a/js/navigation/navigator.js b/js/navigation/navigator.js
@@ -50,6 +50,12 @@ define(["jquery",
 			// is not fired.
 			window.history.replaceState( state, state.title || document.title, href );
 
+			// If we haven't yet received the initial popstate, we need to update the reference
+			// href so that we compare against the correct location
+			if ( this.ignoreInitialHashChange ) {
+				initialHref = href;
+			}
+
 			return state;
 		},
 
diff --git a/tests/integration/navigation/event/early_popstate_handler.js b/tests/integration/navigation/event/early_popstate_handler.js
@@ -1,7 +1,7 @@
 define( [ "jquery" ], function( $ ) {
 
 // TODO: Attaching early to popstate like this becomes unnecessary once the navigate event has been
-// properly implemented in that it removes its popstate handler upon teardown and attaches it upon
+// properly implemented so that it removes its popstate handler upon teardown and attaches it upon
 // setup, rather than attaching it upon setup and then simply making sure upon subsequent calls to
 // setup that the handlers are attached.
 $( window ).on( "popstate", function( event ) {
diff --git a/tests/integration/navigation/event/index.html b/tests/integration/navigation/event/index.html
@@ -12,7 +12,7 @@
 	<link rel="stylesheet" href="../../../../external/qunit/qunit.css"/>
 	<link rel="stylesheet" href="../../../jqm-tests.css"/>
 	<script>
-		$.testHelper.asyncLoad( [
+		$.testHelper.asyncLoad([
 			[ "early_popstate_handler.js" ],
 			[ "events/navigate" ],
 			[ "event_core.js" ]
diff --git a/tests/integration/navigation/sequence/index.html b/tests/integration/navigation/sequence/index.html
@@ -9,8 +9,10 @@
 	<script src="../../../../js/jquery.tag.inserter.js"></script>
 	<script>
 		$(document).bind('mobileinit',function(){
+
 			// Expect content to inherit this theme when not explicitly set
 			$.mobile.page.prototype.options.contentTheme = "d";
+			$.testHelper.setPushState();
 		});
 	</script>
 	<script src="../../../jquery.setNameSpace.js"></script>
diff --git a/tests/integration/navigation/sequence/sequence-redirect.html b/tests/integration/navigation/sequence/sequence-redirect.html
@@ -9,8 +9,10 @@
 	<script src="../../../../js/jquery.tag.inserter.js"></script>
 	<script>
 		$(document).bind('mobileinit',function(){
+
 			// Expect content to inherit this theme when not explicitly set
 			$.mobile.page.prototype.options.contentTheme = "d";
+			$.testHelper.setPushState();
 		});
 	</script>
 	<script src="../../../jquery.setNameSpace.js"></script>
@@ -21,7 +23,7 @@
 		$.testHelper.asyncLoad([
 			[
 				"widgets/dialog",
-				"widgets/page",
+				"widgets/page.dialog",
 				"widgets/popup"
 			],
 			[ "init" ],
@@ -31,25 +33,23 @@
 		], "../../../../js");
 	</script>
 
-
 	<link rel="stylesheet" href="../../../../css/themes/default/jquery.mobile.css"/>
 	<link rel="stylesheet" href="../../../../external/qunit/qunit.css"/>
-
 	<script src="../../../swarminject.js"></script>
 </head>
 <body>
 
-<div id="qunit"></div>
+	<div id="qunit"></div>
 
-<div data-nstest-role="page" id="sequenceRedirect"></div>
-<div id="internal-page" data-nstest-role="page"></div>
+	<div data-nstest-role="page" id="sequenceRedirect"></div>
+	<div id="internal-page" data-nstest-role="page"></div>
 
-<!--
-This test page is used when testing initial URLs of the form
-http://domain/path/to/page1.html#/path/to/page2.html. It really only works if
-you load sequence-tests.html via the hash, i.e.,
-http://domain/path/to/sequence/index.html#/path/to/sequence-redirect.html
--->
+	<!--
+	This test page is used when testing initial URLs of the form
+	http://domain/path/to/page1.html#/path/to/page2.html. It really only works if
+	you load sequence-tests.html via the hash, i.e.,
+	http://domain/path/to/sequence/index.html#/path/to/sequence-redirect.html
+	-->
 
 </body>
 </html>
diff --git a/tests/integration/navigation/sequence/sequence_core.js b/tests/integration/navigation/sequence/sequence_core.js
@@ -9,8 +9,6 @@
 	// The more we click around the test pages and the more combinations of paths
 	// we try, the better.
 
-	$.testHelper.setPushState();
-
 	// If the start page is not there, wait for it to appear. Otherwise, leave
 	// some time before starting the actual run to allow the popstate handler to
 	// awaken from its slumber
@@ -46,7 +44,8 @@
 
 		maybeWaitForStartPage([
 			function() {
-				origUrl = location.href.replace( "&ui-state=dialog", "" );
+				origUrl = $.mobile.path.parseUrl(
+					location.href.replace( "&ui-state=dialog", "" ) ).hrefNoHash;
 				$( "#openInternalPage" ).click();
 			},
 			{
