fixed bug where a preset data-url was being prefixed by the base url, rather than replacing the whole hash. Fixes #591

scottjehl · scottjehl · commit 2c997873803d · 2011-02-01T12:23:07.000-05:00
diff --git a/docs/pages/docs-links-urltest/index.html b/docs/pages/docs-links-urltest/index.html
@@ -10,7 +10,7 @@
 </head> 
 <body> 
 
-	<div data-role="page" data-url="docs-links-urltest/">
+	<div data-role="page" data-url="docs/pages/docs-links-urltest/">
 		<div data-role="header">
 			<h1>URL Test Page</h1>
 		</div>
diff --git a/docs/pages/docs-pages.html b/docs/pages/docs-pages.html
@@ -170,14 +170,14 @@ <h2>Local, internal linked "pages"</h2>
 		
 		
 		<h2>Back linking</h2>
-		<p>If you use the attribute <code>data-rel="back"</code> on an anchor, any clicks on that anchor will mimic the back button, going back one history entry and ignoring the anchor's default href. This is particularly useful when linking back to a named page, such as a link that says "home", or when generating "back" buttons with JavaScript, such as a button to close a dialog. When using this feature in your source markup, <strong>be sure to provide a meaningful href that actually points to the URL of the referring page (this will allow the feature to work for users in C-Grade browsers</strong>. Also, pease keep in mind that if you just want a reverse transition without actually going back in history, you should use the <code>data-direction="reverse"</code> attribute instead.</p>
+		<p>If you use the attribute <code>data-rel="back"</code> on an anchor, any clicks on that anchor will mimic the back button, going back one history entry and ignoring the anchor's default href. This is particularly useful when linking back to a named page, such as a link that says "home", or when generating "back" buttons with JavaScript, such as a button to close a dialog. When using this feature in your source markup, <strong>be sure to provide a meaningful href that actually points to the URL of the referring page (this will allow the feature to work for users in C-Grade browsers</strong>. Also, please keep in mind that if you just want a reverse transition without actually going back in history, you should use the <code>data-direction="reverse"</code> attribute instead.</p>
 		
 		<h2>Redirects and linking to directories</h2>
 		<p>When linking to directory indexes (such as href="typesofcats/" instead of href="typesofcats/index.html"), you must provide a trailing slash. This is because jQuery Mobile assumes the section after the last "/" character in a url is a filename, and it will remove that section when creating base urls from which future pages will be referenced.</p>
 		
-		<p>However, you can work around this issue by returning your page div with a <code>data-url</code> attribute already included, and jQuery Mobile will use that instead of the url used to request that page. This also allows you to return urls that change as the result of a redirect, for example, you might post a form to "/login.html" but return a page from the url "/account" after a successful submission. This tool allows you to take control of the jQuery Mobile history stack in these situations. Here's an example:</p>
+		<p>However, you can work around this issue by returning your page div with a <code>data-url</code> attribute already specified. When you do this, jQuery Mobile will use that attribute's value for updating the URL, instead of the url used to request that page. This also allows you to return urls that change as the result of a redirect, for example, you might post a form to "/login.html" but return a page from the url "/account" after a successful submission. This tool allows you to take control of the jQuery Mobile history stack in these situations. Here's an example:</p>
 		
-		<p>The following link points to "docs-links-urltest/index.html": <a href="docs-links-urltest/index.html">Test Link</a> which is a directory with an index page. The return page will update the hash as "docs-links-urltest/" with a trailing slash. This is done via the data-url attribute in that page's source.</p>
+		<p>The following link points to "docs-links-urltest/index.html": <a href="docs-links-urltest/index.html">Test Link</a> which is a directory with an index page. The return page will update the hash as "docs/pages/docs-links-urltest/" with a trailing slash. This is done via the data-url attribute in that page's source. Keep in mind that the value will replace the entire hash, and it is up to you to replace it with a URL that actually resolves to the correct page when requested via refresh or deep link.</p>
 		
 		
 		<p>Learn more about the technical details of the navigation model and <a href="docs-navmodel.html">Ajax, hashes and history</a> in jQuery mobile.</p>
diff --git a/js/jquery.mobile.navigation.js b/js/jquery.mobile.navigation.js
@@ -506,7 +506,7 @@
 						if(base){
 							base.set( redirectLoc );
 						}
-						url = fileUrl = path.makeAbsolute( path.getFilePath( redirectLoc ) );
+						url = fileUrl = path.getFilePath( redirectLoc );
 					}
 					else {
 						if(base){

Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@`
`506`	`506`	`if(base){`
`507`	`507`	`base.set( redirectLoc );`
`508`	`508`	`}`
`509`		`- url = fileUrl = path.makeAbsolute( path.getFilePath( redirectLoc ) );`
	`509`	`+ url = fileUrl = path.getFilePath( redirectLoc );`
`510`	`510`	`}`
`511`	`511`	`else {`
`512`	`512`	`if(base){`