URLs in the State Hashes for HTML4 Browsers are now even shorter

Author: balupton

README.md

@@ -238,6 +238,7 @@ Thanks! every bit of help really does make a difference. Again thank you.
 	- Fixed Session Storage Issue - Reported by a whole bunch of different people; [one](https://github.com/balupton/History.js/issues#issue/36), [two](https://github.com/balupton/History.js/issues#issue/37), [three](http://getsatisfaction.com/balupton/topics/history_js_1_6_losing_state_after_manual_page_reload)
 	- Fixed URL Encoding Issue - [Reported](https://github.com/balupton/history.js/issues/#issue/33) by [Rob Madole](http://robmadole.com/)
 	- Disabled support for IE6,7,8 when using the Prototype Adapter (there is nothing we can do about this, it is due to a bug in the prototype library) - [Reported](https://github.com/balupton/history.js/issues#issue/39) by [Sindre Wimberger](http://sindre.at/)
+	- URLs in the State Hashes for HTML4 Browsers are now even shorter - [Discussion](https://github.com/balupton/history.js/issues#issue/28)
 
 - v1.6.0 - March 22 2011
 	- Added Zepto adapter thanks to [Matt Garrett](http://twitter.com/#!/matthewgarrett)

scripts/uncompressed/history.html4.js

@@ -414,15 +414,17 @@
 				History.saveHash(currentHash);
 
 				// Expand Hash
-				currentState = History.extractState(currentHash||document.location.href,true);
-				if ( !currentState ) {
+				if ( currentHash && History.isTraditionalAnchor(currentHash) ) {
 					//History.debug('History.onHashChange: traditional anchor', currentHash);
 					// Traditional Anchor Hash
 					History.Adapter.trigger(window,'anchorchange');
 					History.busy(false);
 					return false;
 				}
 
+				// Create State
+				currentState = History.extractState(History.getFullUrl(currentHash||document.location.href,false),true);
+
 				// Check if we are the same state
 				if ( History.isLastSavedState(currentState) ) {
 					//History.debug('History.onHashChange: no change');

scripts/uncompressed/history.js

@@ -408,11 +408,13 @@
 		 * History.getFullUrl(url)
 		 * Ensures that we have an absolute URL and not a relative URL
 		 * @param {string} url
+		 * @param {Boolean} allowBaseHref
 		 * @return {string} fullUrl
 		 */
-		History.getFullUrl = function(url){
+		History.getFullUrl = function(url,allowBaseHref){
 			// Prepare
 			var fullUrl = url, firstChar = url.substring(0,1);
+			allowBaseHref = (typeof allowBaseHref === 'undefined') ? true : allowBaseHref;
 
 			// Check
 			if ( /[a-z]+\:\/\//.test(url) ) {
@@ -432,7 +434,16 @@
 			}
 			else {
 				// Relative URL
-				fullUrl = History.getBaseUrl()+url;
+				if ( allowBaseHref ) {
+					fullUrl = History.getBaseUrl()+url.replace(/^(\.\/)+/,'');
+				} else {
+					fullUrl = History.getBasePageUrl()+url.replace(/^(\.\/)+/,'');
+				}
+				// We have an if condition above as we do not want hashes
+				// which are relative to the baseHref in our URLs
+				// as if the baseHref changes, then all our bookmarks
+				// would now point to different locations
+				// whereas the basePageUrl will always stay the same
 			}
 
 			// Return
@@ -447,13 +458,29 @@
 		 */
 		History.getShortUrl = function(url){
 			// Prepare
-			var shortUrl, rootUrl = History.getRootUrl(); // History.getBaseHref()||History.getBasePageUrl()
+			var shortUrl = url, baseUrl = History.getBaseUrl(), rootUrl = History.getRootUrl();
+
+			// Trim baseUrl
+			if ( History.emulated.pushState ) {
+				// We are in a if statement as when pushState is not emulated
+				// The actual url these short urls are relative to can change
+				// So within the same session, we the url may end up somewhere different
+				shortUrl = shortUrl.replace(baseUrl,'');
+			}
 
-			// Adjust
-			shortUrl = url.replace(rootUrl,'/');
+			// Trim rootUrl
+			shortUrl = shortUrl.replace(rootUrl,'/');
+
+			// Ensure we can still detect it as a state
+			if ( History.isTraditionalAnchor(shortUrl) ) {
+				shortUrl = './'+shortUrl;
+			}
+
+			// Clean It
+			shortUrl = shortUrl.replace(/^(\.\/)+/g,'./').replace(/\#$/,'');
 
 			// Return
-			return shortUrl.replace(/\#$/,'');
+			return shortUrl;
 		};
 
 		// ----------------------------------------------------------------------
@@ -742,9 +769,25 @@
 			return id||false;
 		};
 
+		/**
+		 * History.isTraditionalAnchor
+		 * Checks to see if the url is a traditional anchor or not
+		 * @param {String} url_or_hash
+		 * @return {Boolean}
+		 */
+		History.isTraditionalAnchor = function(url_or_hash){
+			// Check
+			var isTraditional = !(/[\/\?\.]/.test(url_or_hash));
+
+			// Return
+			return isTraditional;
+		};
+
 		/**
 		 * History.extractState
 		 * Get a State by it's URL or Hash
+		 * @param {String} url_or_hash
+		 * @return {State|null}
 		 */
 		History.extractState = function(url_or_hash,create){
 			// Prepare
@@ -769,7 +812,7 @@
 				}
 
 				// Create State
-				if ( !State && create && /\//.test(url_or_hash) ) {
+				if ( !State && create && !History.isTraditionalAnchor(url_or_hash) ) {
 					State = History.createStateObject(null,null,url);
 				}
 			}
@@ -1088,22 +1131,6 @@
 			return hash;
 		};
 
-		/**
-		 * History.isTraditionalAnchor(url)
-		 * Checks to see if the url is a traditional anchor
-		 * @param {string} url
-		 * @return {boolean}
-		 */
-		History.isTraditionalAnchor = function(url){
-			var
-				hash = History.getHashByUrl(url),
-				el = document.getElementById(hash),
-				isTraditionalAnchor = typeof el !== 'undefined';
-
-			// Return isTraditionalAnchor
-			return isTraditionalAnchor;
-		};
-
 		/**
 		 * History.setTitle(title)
 		 * Applies the title to the document