revert base tag merge and query param hash merge

Author: johnbender

js/jquery.mobile.core.js

@@ -84,10 +84,6 @@ define( [ "jquery", "text!../version.txt" ], function( $, __version__ ) {
 			hoverDelay: 200
 		},
 
-		// disable the alteration of the dynamic base tag or links in the case
-		// that a dynamic base tag isn't supported
-		dynamicBaseEnabled: true,
-
 		// TODO might be useful upstream in jquery itself ?
 		keyCode: {
 			ALT: 18,

js/jquery.mobile.navigation.js

@@ -404,48 +404,22 @@ define( [
 		getScreenHeight = $.mobile.getScreenHeight;
 
 		//base element management, defined depending on dynamic base tag support
-		var base = {
+		var base = $.support.dynamicBaseTag ? {
+
 			//define base element, for use in routing asset urls that are referenced in Ajax-requested markup
 			element: ( $base.length ? $base : $( "<base>", { href: documentBase.hrefNoHash } ).prependTo( $head ) ),
 
-			linkSelector: "[src], link[href], a[rel='external'], :jqmData(ajax='false'), a[target]",
-
 			//set the generated BASE element's href attribute to a new page's base path
-			set: function( href, page ) {
-				// we should do nothing if the user wants to manage their url base manually
-				if ( !$.mobile.dynamicBaseEnabled ){
-					return;
-				}
-
-				// we should use the base tag if we can manipulate it dynamically
-				if ( $.support.dynamicBaseTag ){
-					base.element.attr( "href", path.makeUrlAbsolute( href, documentBase ) );
-				}
-
-				// otherwise rewrite src and href attrs to use a base url
-				if ( !$.support.dynamicBaseTag && page ) {
-					var newPath = path.get( href );
-					page.find( base.linkSelector ).each(function( i, link ) {
-						var thisAttr = $( link ).is( '[href]' ) ? 'href' : $( link ).is( '[src]' ) ? 'src' : 'action',
-						thisUrl = $( link ).attr( thisAttr );
-
-						// XXX_jblas: We need to fix this so that it removes the document
-						//            base URL, and then prepends with the new page URL.
-						//if full path exists and is same, chop it - helps IE out
-						thisUrl = thisUrl.replace( location.protocol + '//' + location.host + location.pathname, '' );
-
-						if ( !/^(\w+:|#|\/)/.test( thisUrl ) ) {
-							$( link ).attr( thisAttr, newPath + thisUrl );
-						}
-					});
-				}
+			set: function( href ) {
+				base.element.attr( "href", path.makeUrlAbsolute( href, documentBase ) );
 			},
 
 			//set the generated BASE element's href attribute to a new page's base path
 			reset: function() {
 				base.element.attr( "href", documentBase.hrefNoHash );
 			}
-		};
+
+		} : undefined;
 
 	/* internal utility functions */
 
@@ -627,12 +601,6 @@ define( [
 		$page.page();
 	}
 
-	// determine the current base url
-	function findBaseWithDefault() {
-		var closestBase = ( $.mobile.activePage && getClosestBaseUrl( $.mobile.activePage ) );
-		return closestBase || documentBase.hrefNoHash;
-	}
-
 	/* exposed $.mobile methods */
 
 	//animation complete callback
@@ -658,6 +626,8 @@ define( [
 
 	$.mobile.dialogHashKey = dialogHashKey;
 
+
+
 	//enable cross-domain page support
 	$.mobile.allowCrossDomainPages = false;
 
@@ -710,6 +680,12 @@ define( [
 			// page is loaded off the network.
 			dupCachedPage = null,
 
+			// determine the current base url
+			findBaseWithDefault = function() {
+				var closestBase = ( $.mobile.activePage && getClosestBaseUrl( $.mobile.activePage ) );
+				return closestBase || documentBase.hrefNoHash;
+			},
+
 			// The absolute version of the URL passed into the function. This
 			// version of the URL may contain dialog/subpage params in it.
 			absUrl = path.makeUrlAbsolute( url, findBaseWithDefault() );
@@ -857,6 +833,10 @@ define( [
 						url = fileUrl = path.getFilePath( $( "<div>" + RegExp.$1 + "</div>" ).text() );
 					}
 
+					if ( base ) {
+						base.set( fileUrl );
+					}
+
 					//workaround to allow scripts to execute when included in page divs
 					all.get( 0 ).innerHTML = html;
 					page = all.find( ":jqmData(role='page'), :jqmData(role='dialog')" ).first();
@@ -873,7 +853,24 @@ define( [
 						page.jqmData( "title", newPageTitle );
 					}
 
-					base.set( fileUrl, page );
+					//rewrite src and href attrs to use a base url
+					if ( !$.support.dynamicBaseTag ) {
+						var newPath = path.get( fileUrl );
+						page.find( "[src], link[href], a[rel='external'], :jqmData(ajax='false'), a[target]" ).each(function() {
+							var thisAttr = $( this ).is( '[href]' ) ? 'href' :
+									$( this ).is( '[src]' ) ? 'src' : 'action',
+								thisUrl = $( this ).attr( thisAttr );
+
+							// XXX_jblas: We need to fix this so that it removes the document
+							//            base URL, and then prepends with the new page URL.
+							//if full path exists and is same, chop it - helps IE out
+							thisUrl = thisUrl.replace( location.protocol + '//' + location.host + location.pathname, '' );
+
+							if ( !/^(\w+:|#|\/)/.test( thisUrl ) ) {
+								$( this ).attr( thisAttr, newPath + thisUrl );
+							}
+						});
+					}
 
 					//append to page and enhance
 					// TODO taging a page with external to make sure that embedded pages aren't removed
@@ -897,6 +894,7 @@ define( [
 					}
 
 					//bind pageHide to removePage after it's hidden, if the page options specify to do so
+
 					// Remove loading message.
 					if ( settings.showLoadMsg ) {
 						hideMsg();
@@ -914,7 +912,9 @@ define( [
 				},
 				error: function( xhr, textStatus, errorThrown ) {
 					//set base back to current path
-					base.set( path.get() );
+					if ( base ) {
+						base.set( path.get() );
+					}
 
 					// Add error info to our triggerData.
 					triggerData.xhr = xhr;
@@ -975,33 +975,18 @@ define( [
 			return;
 		}
 
-		var settings = $.extend( {}, $.mobile.changePage.defaults, options ), isString;
+		var settings = $.extend( {}, $.mobile.changePage.defaults, options );
 
 		// Make sure we have a pageContainer to work with.
 		settings.pageContainer = settings.pageContainer || $.mobile.pageContainer;
 
 		// Make sure we have a fromPage.
 		settings.fromPage = settings.fromPage || $.mobile.activePage;
 
-		isString = (typeof toPage === "string");
-
 		var mpc = settings.pageContainer,
 			pbcEvent = new $.Event( "pagebeforechange" ),
 			triggerData = { toPage: toPage, options: settings };
 
-		// NOTE: preserve the original target as the dataUrl value will be simplified
-		//       eg, removing ui-state, and removing query params from the hash
-		//       this is so that users who want to use query params have access to them
-		//       in the event bindings for the page life cycle See issue #5085
-		if ( isString ) {
-			// if the toPage is a string simply convert it
-			triggerData.absUrl = path.makeUrlAbsolute( toPage, findBaseWithDefault() );
-		} else {
-			// if the toPage is a jQuery object grab the absolute url stored
-			// in the loadPage callback where it exists
-			triggerData.absUrl = toPage.data( 'absUrl' );
-		}
-
 		// Let listeners know we're about to change the current page.
 		mpc.trigger( pbcEvent, triggerData );
 
@@ -1025,15 +1010,17 @@ define( [
 		// to make sure it is loaded into the DOM. We'll listen
 		// to the promise object it returns so we know when
 		// it is done loading or if an error ocurred.
-		if ( isString ) {
+		if ( typeof toPage === "string" ) {
+			// preserve the original target as the dataUrl value will be simplified
+			// eg, removing ui-state, and removing query params from the hash
+			// this is so that users who want to use query params have access to them
+			// in the event bindings for the page life cycle See issue #5085
+			settings.target = toPage;
+
 			$.mobile.loadPage( toPage, settings )
 				.done(function( url, options, newPage, dupCachedPage ) {
 					isPageTransitioning = false;
 					options.duplicateCachedPage = dupCachedPage;
-
-					// store the original absolute url so that it can be provided
-					// to events in the triggerData of the subsequent changePage call
-					newPage.data( 'absUrl', triggerData.absUrl );
 					$.mobile.changePage( newPage, options );
 				})
 				.fail(function( url, options ) {
@@ -1186,7 +1173,6 @@ define( [
 			if ( alreadyThere ) {
 				urlHistory.activeIndex = Math.max( 0, urlHistory.activeIndex - 1 );
 			}
-
 			urlHistory.addNew( url, settings.transition, pageTitle, pageUrl, settings.role );
 		}
 
@@ -1237,8 +1223,9 @@ define( [
 		allowSamePageTransition: false
 	};
 
-	/* Event Bindings - hashchange, submit, and click */
-	function findClosestLink( ele )	{
+/* Event Bindings - hashchange, submit, and click */
+	function findClosestLink( ele )
+	{
 		while ( ele ) {
 			// Look for the closest element with a nodeName of "a".
 			// Note that we are checking if we have a valid nodeName
@@ -1256,16 +1243,17 @@ define( [
 	}
 
 	// The base URL for any given element depends on the page it resides in.
-	function getClosestBaseUrl( ele )	{
+	function getClosestBaseUrl( ele )
+	{
 		// Find the closest page and extract out its url.
 		var url = $( ele ).closest( ".ui-page" ).jqmData( "url" ),
 			base = documentBase.hrefNoHash;
 
-		if ( !$.mobile.dynamicBaseEnabled || !url || !path.isPath( url ) ) {
+		if ( !url || !path.isPath( url ) ) {
 			url = base;
 		}
 
-		return path.makeUrlAbsolute( url, base );
+		return path.makeUrlAbsolute( url, base);
 	}
 
 	//The following event bindings should be bound after mobileinit has been triggered

tests/unit/navigation/base-tests.html

@@ -5,7 +5,8 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>jQuery Mobile Navigation Test Suite</title>
 
-  <script>
+    <script>
+
 	// This unit test requires a base tag to be set within the file.
 	// Most browsers require a base tag with an @href URL that is absolute.
 	// We need to dynamically inject the base tag so we can prefix it with

tests/unit/navigation/navigation_base.js

@@ -4,17 +4,17 @@
 (function($){
 	var baseDir = $.mobile.path.parseUrl($("base").attr("href")).directory,
 		contentDir = $.mobile.path.makePathAbsolute("../content/", baseDir),
-		home = location.pathname + location.search,
-		baseTagEnabled = $.mobile.dynamicBaseTagEnabled,
-		baseTagSupported = $.support.dynamicBaseTag;
+		home = location.pathname + location.search;
 
 	module('jquery.mobile.navigation.js - base tag', {
 		setup: function(){
-			$.testHelper.navReset( home );
-
-			// reset the value to prevent test collision
-			$.mobile.dynamicBaseTagEnabled = baseTagEnabled;
-			$.support.dynamicBaseTag = baseTagSupported;
+			if ( location.hash ) {
+				stop();
+				$(document).one("pagechange", function() {
+					start();
+				} );
+				location.hash = "";
+			}
 		}
 	});
 
@@ -201,69 +201,6 @@
 				});
 
 				start();
-			}
-		]);
-	});
-
-	var testBaseTagAlteration = function( assertions ) {
-		$.testHelper.pageSequence([
-			function(){
-				$.mobile.changePage( "../../base-change.html" );
-			},
-
-			function(){
-				assertions();
-				window.history.back();
-			},
-
-			function() {
-				start();
-			}
-		]);
-
-	};
-
-	asyncTest( "disabling base tag changes should prevent base href value changes", function() {
-		var baseHref = $( "base" ).attr( "href" );
-		$.mobile.dynamicBaseEnabled = false;
-
-		testBaseTagAlteration(function() {
-				if ( $.support.dynamicBaseTag ) {
-					equal( baseHref, $( "base" ).attr( "href" ), "the base href value should be unchanged" );
-				} else {
-					equal( $.mobile.activePage.find( "#base-change-link" ).attr( "href" ), "foo", "the link href's remain unchanged" );
-				}
-		});
-	});
-
-	asyncTest( "enabling base tag changes should enable base href value changes", function() {
-		var baseHref = $( "base" ).attr( "href" );
-		$.mobile.dynamicBaseEnabled = true;
-		$.support.dynamicBaseTag = true;
-
-		testBaseTagAlteration(function() {
-			ok( baseHref !== $( "base" ).attr( "href" ), "the base href value should be changed" );
-		});
-	});
-
-	asyncTest( "enabling base tag changes when a dynamic base isn't supported should alter links", function() {
-		$.mobile.dynamicBaseEnabled = true;
-		$.support.dynamicBaseTag = false;
-
-		testBaseTagAlteration(function() {
-			var linkHref = $.mobile.activePage.find( "#base-change-link" ).attr( "href" );
-
-			if ( $.support.pushState ) {
-				equal( linkHref,
-					$.mobile.path.get( location.href ) + "foo",
-					"the link's href is changed" );
-			} else {
-				// compare the pathname of the links href with the directory of the current
-				// location + foo
-				equal( $.mobile.path.parseUrl( linkHref ).pathname,
-					$.mobile.path.parseUrl( location.href ).directory + "foo",
-					"the link's href is changed" );
-			}
-		});
+			}]);
 	});
 })(jQuery);

tests/unit/navigation/navigation_core.js

@@ -1312,33 +1312,4 @@
 			}
 		]);
 	});
-
-
-	var absHomeUrl = $.mobile.path.parseLocation().hrefNoHash,
-	    homeDomain = $.mobile.path.parseLocation().domain;
-
-	asyncTest( "page load events are providided with the absolute url for the content", function() {
-		var requestPath;
-
-		expect( 3 );
-
-		$( document ).one( "pagebeforechange", function( event, data ) {
-			equal( data.absUrl, absHomeUrl + "#bar");
-		});
-
-		$( document ).one( "pagechange", function( event, data ) {
-			equal( data.absUrl, absHomeUrl + "#bar" );
-		});
-
-		$.mobile.changePage( "#bar" );
-
-		requestPath = "/theres/no/way/this/page/exists.html";
-
-		$( document ).one( "pagechangefailed", function( event, data ) {
-			equal( data.absUrl, homeDomain + requestPath );
-			start();
-		});
-
-		$.mobile.changePage( requestPath );
-	});
 })(jQuery);