Merge branch 'master' of github.com:jquery/jquery-mobile

Author: jaspermdegroot

js/jquery.mobile.navigation.js

@@ -49,27 +49,13 @@ define( [
 			//
 			urlParseRE: /^(((([^:\/#\?]+:)?(?:(\/\/)((?:(([^:@\/#\?]+)(?:\:([^:@\/#\?]+))?)@)?(([^:\/#\?\]\[]+|\[[^\/\]@#?]+\])(?:\:([0-9]+))?))?)?)?((\/?(?:[^\/\?#]+\/+)*)([^\?#]*)))?(\?[^#]+)?)(#.*)?/,
 
-			// Abstraction to address xss (Issue #4787) in browsers that auto decode the username:pass
-			// portion of location.href. All references to location.href should be replaced with a call
-			// to this method so that it can be dealt with properly here
+			// Abstraction to address xss (Issue #4787) by removing the authority in
+			// browsers that auto	decode it. All references to location.href should be
+			// replaced with a call to this method so that it can be dealt with properly here
 			getLocation: function( url ) {
-				var uri = this.parseUrl( url || location.href ),
-					encodedUserPass = "";
+				var uri = url ? $.mobile.path.parseUrl( url ) : location;
 
-				if( uri.username ){
-					encodedUserPass = encodeURI( uri.username );
-				}
-
-				if( uri.password  ){
-					encodedUserPass = encodedUserPass + ":" + encodeURI( uri.password );
-				}
-
-				if( encodedUserPass ){
-					return uri.protocol + "//" + encodedUserPass + "@" +
-						uri.host + uri.pathname + uri.search + uri.hash;
-				}
-
-				return uri.href;
+				return uri.protocol + "//" + uri.host + uri.pathname + uri.search + uri.hash;
 			},
 
 			parseLocation: function() {

js/jquery.ui.widget.js

@@ -1,7 +1,7 @@
 /*!
- * jQuery UI Widget @VERSION
+ * jQuery UI Widget v1.9.0-beta.1
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012, https://github.com/jquery/jquery-ui/blob/1.9.0-beta.1/AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *

tests/unit/navigation/navigation_helpers.js

@@ -241,14 +241,12 @@
 
 	test( "path.getLocation works properly", function() {
 		equal( $.mobile.path.getLocation("http://example.com/"), "http://example.com/" );
-		equal( $.mobile.path.getLocation("http://[email protected]"), "http://[email protected]" );
-		equal( $.mobile.path.getLocation("http://foo:[email protected]"), "http://foo:[email protected]" );
-		equal( $.mobile.path.getLocation("http://<foo<:[email protected]"), "http://%3Cfoo%3C:[email protected]" );
-		equal( $.mobile.path.getLocation("http://foo:<bar<@example.com"), "http://foo:%3Cbar%[email protected]" );
-		equal( $.mobile.path.getLocation("http://<foo<:<bar<@example.com"), "http://%3Cfoo%3C:%3Cbar%[email protected]" );
+		equal( $.mobile.path.getLocation("http://[email protected]"), "http://example.com" );
+		equal( $.mobile.path.getLocation("http://foo:[email protected]"), "http://example.com" );
+		equal( $.mobile.path.getLocation("http://<foo<:[email protected]"), "http://example.com" );
 
 		var allUriParts = "http://jblas:[email protected]:8080/mail/inbox?msg=1234&type=unread#msg-content";
 
-		equal( $.mobile.path.getLocation( allUriParts ), allUriParts );
+		equal( $.mobile.path.getLocation( allUriParts ), allUriParts.replace( "jblas:password@", "") );
 	});
 })(jQuery);

tests/unit/support/support_core.js

@@ -47,9 +47,7 @@ $.testHelper.excludeFileProtocol(function(){
 	});
 
 	asyncTest( "detects touch", function() {
-		$.extend(window, {
-			touchend: true
-		});
+		document.ontouchend = true;
 
 		$.testHelper.reloadModule( "jquery.mobile.support.touch" ).done( function() {
 			ok( $.mobile.support.touch, "touch is supported" );