jquery-historyjs 0.1.0 → 0.2.1

data/vendor/assets/javascripts/history_html4.js

@@ -9,7 +9,7 @@
 (function(window,undefined){
 	"use strict";
 
-	// --------------------------------------------------------------------------
+	// ========================================================================
 	// Initialise
 
 	// Localise Globals
@@ -25,7 +25,8 @@
 		throw new Error('History.js HTML4 Support has already been loaded...');
 	}
 
-	// --------------------------------------------------------------------------
+
+	// ========================================================================
 	// Initialise HTML4 Support
 
 	// Initialise HTML4 Support
@@ -39,7 +40,8 @@
 			History.initHtml4.initialized = true;
 		}
 
-		// ----------------------------------------------------------------------
+
+		// ====================================================================
 		// Properties
 
 		/**
@@ -49,7 +51,7 @@
 		History.enabled = true;
 
 
-		// ----------------------------------------------------------------------
+		// ====================================================================
 		// Hash Storage
 
 		/**
@@ -66,10 +68,11 @@
 		 */
 		History.isLastHash = function(newHash){
 			// Prepare
-			var oldHash = History.getHashByIndex();
+			var oldHash = History.getHashByIndex(),
+				isLast;
 
 			// Check
-			var isLast = newHash === oldHash;
+			isLast = newHash === oldHash;
 
 			// Return isLast
 			return isLast;
@@ -122,7 +125,8 @@
 			return hash;
 		};
 
-		// ----------------------------------------------------------------------
+
+		// ====================================================================
 		// Discarded States
 
 		/**
@@ -146,10 +150,11 @@
 		History.discardState = function(discardedState,forwardState,backState){
 			//History.debug('History.discardState', arguments);
 			// Prepare
-			var discardedStateHash = History.getHashByState(discardedState);
+			var discardedStateHash = History.getHashByState(discardedState),
+				discardObject;
 
 			// Create Discard Object
-			var discardObject = {
+			discardObject = {
 				'discardedState': discardedState,
 				'backState': backState,
 				'forwardState': forwardState
@@ -192,10 +197,11 @@
 		 */
 		History.discardedState = function(State){
 			// Prepare
-			var StateHash = History.getHashByState(State);
+			var StateHash = History.getHashByState(State),
+				discarded;
 
 			// Check
-			var discarded = History.discardedStates[StateHash]||false;
+			discarded = History.discardedStates[StateHash]||false;
 
 			// Return true
 			return discarded;
@@ -237,7 +243,8 @@
 			return true;
 		};
 
-		// ----------------------------------------------------------------------
+
+		// ====================================================================
 		// HTML4 HashChange Support
 
 		if ( History.emulated.hashChange ) {
@@ -254,8 +261,9 @@
 				History.checkerFunction = null;
 
 				// Define some variables that will help in our checker function
-				var
-					lastDocumentHash = '';
+				var lastDocumentHash = '',
+					iframeId, iframe,
+					lastIframeHash, checkerRunning;
 
 				// Handle depending on the browser
 				if ( History.isInternetExplorer() ) {
@@ -263,9 +271,8 @@
 					// We need to use an iframe to emulate the back and forward buttons
 
 					// Create iFrame
-					var
-						iframeId = 'historyjs-iframe',
-						iframe = document.createElement('iframe');
+					iframeId = 'historyjs-iframe';
+					iframe = document.createElement('iframe');
 
 					// Adjust iFarme
 					iframe.setAttribute('id', iframeId);
@@ -279,9 +286,8 @@
 					iframe.contentWindow.document.close();
 
 					// Define some variables that will help in our checker function
-					var
-						lastIframeHash = '',
-						checkerRunning = false;
+					lastIframeHash = '';
+					checkerRunning = false;
 
 					// Define the checker function
 					History.checkerFunction = function(){
@@ -294,8 +300,7 @@
 						checkerRunning = true;
 
 						// Fetch
-						var
-							documentHash = History.getHash()||'',
+						var documentHash = History.getHash()||'',
 							iframeHash = History.unescapeHash(iframe.contentWindow.document.location.hash)||'';
 
 						// The Document Hash has changed (application caused)
@@ -376,9 +381,10 @@
 		} // History.emulated.hashChange
 
 
-		// ----------------------------------------------------------------------
+		// ====================================================================
 		// HTML5 State Support
 
+		// Non-Native pushState Implementation
 		if ( History.emulated.pushState ) {
 			/*
 			 * We must emulate the HTML5 State Management by using HTML4 HashChange
@@ -392,12 +398,12 @@
 				//History.debug('History.onHashChange', arguments);
 
 				// Prepare
-				var
-					currentUrl						= ((event && event.newURL) || document.location.href),
-					currentHash						= History.getHashByUrl(currentUrl),
-					currentState					= null,
-					currentStateHash			= null,
-					currentStateHashExits	= null;
+				var currentUrl = ((event && event.newURL) || document.location.href),
+					currentHash = History.getHashByUrl(currentUrl),
+					currentState = null,
+					currentStateHash = null,
+					currentStateHashExits = null,
+					discardObject;
 
 				// Check if we are the same state
 				if ( History.isLastHash(currentHash) ) {
@@ -437,7 +443,7 @@
 				currentStateHash = History.getHashByState(currentState);
 
 				// Check if we are DiscardedState
-				var discardObject = History.discardedState(currentState);
+				discardObject = History.discardedState(currentState);
 				if ( discardObject ) {
 					// Ignore this state as it has been discarded and go back to the state before it
 					if ( History.getHashByIndex(-2) === History.getHashByState(discardObject.forwardState) ) {
@@ -495,8 +501,7 @@
 				History.busy(true);
 
 				// Fetch the State Object
-				var
-					newState = History.createStateObject(data,title,url),
+				var newState = History.createStateObject(data,title,url),
 					newStateHash = History.getHashByState(newState),
 					oldState = History.getState(false),
 					oldStateHash = History.getHashByState(oldState),
@@ -572,8 +577,7 @@
 				History.busy(true);
 
 				// Fetch the State Objects
-				var
-					newState        = History.createStateObject(data,title,url),
+				var newState        = History.createStateObject(data,title,url),
 					oldState        = History.getState(false),
 					previousState   = History.getStateByIndex(-2);
 
@@ -587,6 +591,15 @@
 				return true;
 			};
 
+		} // History.emulated.pushState
+
+
+
+		// ====================================================================
+		// Initialise
+
+		// Non-Native pushState Implementation
+		if ( History.emulated.pushState ) {
 			/**
 			 * Ensure initial state is handled correctly
 			 */
@@ -601,6 +614,8 @@
 	}; // History.initHtml4
 
 	// Try and Initialise History
-	History.init();
+	if ( typeof History.init !== 'undefined' ) {
+		History.init();
+	}
 
 })(window);

metadata

@@ -1,93 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jquery-historyjs
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - William Weidendorf
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: railties
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70187635725740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70187635725740
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &70187635725260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 14
-        version: "0.14"
+      - !ruby/object:Gem::Version
+        version: '0.14'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70187635725260
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70187635724800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70187635724800
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &70187635724340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id004
-description: This gem provides History.js and the related HTML4 dependencies for using History.js with jQuery in your Rails 3+ application.
-email: 
+  prerelease: false
+  version_requirements: *70187635724340
+description: This gem provides History.js and the related HTML4 dependencies for using
+  History.js with jQuery in your Rails 3+ application.
+email:
 - wweidendorf@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -103,7 +78,6 @@ files:
 - lib/jquery-historyjs.rb
 - spec/lib/jquery-historyjs_spec.rb
 - spec/spec_helper.rb
-- vendor/assets/javascripts/amplify_store.js
 - vendor/assets/javascripts/history.js
 - vendor/assets/javascripts/history_adapter_jquery.js
 - vendor/assets/javascripts/history_core.js
@@ -111,38 +85,26 @@ files:
 - vendor/assets/javascripts/json2.js
 homepage: http://github.com/wweidendorf/jquery-historyjs
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: jquery-historyjs
-rubygems_version: 1.7.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Use History.js with Rails 3 and jQuery
 test_files: []
-

data/vendor/assets/javascripts/amplify_store.js

@@ -1,251 +0,0 @@
-/*!
- * Amplify Store - Persistent Client-Side Storage 1.0beta
- *
- * Copyright 2011 appendTo LLC. (http://appendto.com/team)
- * Dual licensed under the MIT or GPL licenses.
- * http://appendto.com/open-source-licenses
- *
- * http://amplifyjs.com
- */
-(function( amplify, undefined ) {
-
-var store = amplify.store = function( key, value, options, type ) {
-	var type = store.type;
-	if ( options && options.type && options.type in store.types ) {
-		type = options.type;
-	}
-	return store.types[ type ]( key, value, options || {} );
-};
-
-store.types = {};
-store.type = null;
-store.addType = function( type, storage ) {
-	if ( !store.type ) {
-		store.type = type;
-	}
-
-	store.types[ type ] = storage;
-	store[ type ] = function( key, value, options ) {
-		options = options || {};
-		options.type = type;
-		return store( key, value, options );
-	};
-}
-store.error = function() {
-	return "amplify.store quota exceeded";
-};
-
-function createSimpleStorage( storageType, storage ) {
-	var values = storage.__amplify__ ? JSON.parse( storage.__amplify__ ) : {};
-	function remove( key ) {
-		if ( storage.removeItem ) {
-			storage.removeItem( key );
-		} else {
-			delete storage[ key ];
-		}
-		delete values[ key ];
-	}
-	store.addType( storageType, function( key, value, options ) {
-		var ret = value,
-			now = (new Date()).getTime(),
-			storedValue,
-			parsed;
-
-		if ( !key ) {
-			ret = {};
-			for ( key in values ) {
-				storedValue = storage[ key ];
-				parsed = storedValue ? JSON.parse( storedValue ) : { expires: -1 };
-				if ( parsed.expires && parsed.expires <= now ) {
-					remove( key );
-				} else {
-					ret[ key.replace( /^__amplify__/, "" ) ] = parsed.data;
-				}
-			}
-			storage.__amplify__ = JSON.stringify( values );
-			return ret;
-		}
-
-		// protect against overwriting built-in properties
-		key = "__amplify__" + key;
-
-		if ( value === undefined ) {
-			if ( values[ key ] ) {
-				storedValue = storage[ key ];
-				parsed = storedValue ? JSON.parse( storedValue ) : { expires: -1 };
-				if ( parsed.expires && parsed.expires <= now ) {
-					remove( key );
-				} else {
-					return parsed.data;
-				}
-			}
-		} else {
-			if ( value === null ) {
-				remove( key );
-			} else {
-				parsed = JSON.stringify({
-					data: value,
-					expires: options.expires ? now + options.expires : null
-				});
-				try {
-					storage[ key ] = parsed;
-					values[ key ] = true;
-				// quota exceeded
-				} catch( error ) {
-					// expire old data and try again
-					store[ storageType ]();
-					try {
-						storage[ key ] = parsed;
-						values[ key ] = true;
-					} catch( error ) {
-						throw store.error();
-					}
-				}
-			}
-		}
-
-		storage.__amplify__ = JSON.stringify( values );
-		return ret;
-	});
-}
-
-// localStorage + sessionStorage
-// IE 8+, Firefox 3.5+, Safari 4+, Chrome 4+, Opera 10.5+, iPhone 2+, Android 2+
-for ( var webStorageType in { localStorage: 1, sessionStorage: 1 } ) {
-	// try/catch for file protocol in Firefox
-	try {
-		if ( window[ webStorageType ].getItem ) {
-			createSimpleStorage( webStorageType, window[ webStorageType ] );
-		}
-	} catch( e ) {}
-}
-
-// globalStorage
-// non-standard: Firefox 2+
-// https://developer.mozilla.org/en/dom/storage#globalStorage
-if ( window.globalStorage ) {
-	// try/catch for file protocol in Firefox
-	try {
-		createSimpleStorage( "globalStorage",
-			window.globalStorage[ window.location.hostname ] );
-		// Firefox 2.0 and 3.0 have sessionStorage and globalStorage
-		// make sure we defualt to globalStorage
-		// but don't default to globalStorage in 3.5+ which also has localStorage
-		if ( store.type === "sessionStorage" ) {
-			store.type = "globalStorage";
-		}
-	} catch( e ) {}
-}
-
-// userData
-// non-standard: IE 5+
-// http://msdn.microsoft.com/en-us/library/ms531424(v=vs.85).aspx
-(function() {
-	// append to html instead of body so we can do this from the head
-	var div = document.createElement( "div" ),
-		attrKey = "amplify",
-		attrs;
-	div.style.display = "none";
-	document.getElementsByTagName( "head" )[ 0 ].appendChild( div );
-	if ( div.addBehavior ) {
-		div.addBehavior( "#default#userdata" );
-		div.load( attrKey );
-		attrs = div.getAttribute( attrKey ) ? JSON.parse( div.getAttribute( attrKey ) ) : {};
-
-		store.addType( "userData", function( key, value, options ) {
-			var ret = value,
-				now = (new Date()).getTime(),
-				attr,
-				parsed,
-				prevValue;
-
-			if ( !key ) {
-				ret = {};
-				for ( key in attrs ) {
-					attr = div.getAttribute( key );
-					parsed = attr ? JSON.parse( attr ) : { expires: -1 };
-					if ( parsed.expires && parsed.expires <= now ) {
-						div.removeAttribute( key );
-						delete attrs[ key ];
-					} else {
-						ret[ key ] = parsed.data;
-					}
-				}
-				div.setAttribute( attrKey, JSON.stringify( attrs ) );
-				div.save( attrKey );
-				return ret;
-			}
-
-			// convert invalid characters to dashes
-			// http://www.w3.org/TR/REC-xml/#NT-Name
-			// simplified to assume the starting character is valid
-			// also removed colon as it is invalid in HTML attribute names
-			key = key.replace( /[^-._0-9A-Za-z\xb7\xc0-\xd6\xd8-\xf6\xf8-\u037d\u37f-\u1fff\u200c-\u200d\u203f\u2040\u2070-\u218f]/g, "-" );
-
-			if ( value === undefined ) {
-				if ( key in attrs ) {
-					attr = div.getAttribute( key );
-					parsed = attr ? JSON.parse( attr ) : { expires: -1 };
-					if ( parsed.expires && parsed.expires <= now ) {
-						div.removeAttribute( key );
-						delete attrs[ key ];
-					} else {
-						return parsed.data;
-					}
-				}
-			} else {
-				if ( value === null ) {
-					div.removeAttribute( key );
-					delete attrs[ key ];
-				} else {
-					// we need to get the previous value in case we need to rollback
-					prevValue = div.getAttribute( key );
-					parsed = JSON.stringify({
-						data: value,
-						expires: (options.expires ? (now + options.expires) : null)
-					});
-					div.setAttribute( key, parsed );
-					attrs[ key ] = true;
-				}
-			}
-
-			div.setAttribute( attrKey, JSON.stringify( attrs ) );
-			try {
-				div.save( attrKey );
-			// quota exceeded
-			} catch ( error ) {
-				// roll the value back to the previous value
-				if ( prevValue === null ) {
-					div.removeAttribute( key );
-					delete attrs[ key ];
-				} else {
-					div.setAttribute( key, prevValue );
-				}
-
-				// expire old data and try again
-				store.userData();
-				try {
-					div.setAttribute( key, parsed );
-					attrs[ key ] = true;
-					div.save( attrKey );
-				} catch ( error ) {
-					// roll the value back to the previous value
-					if ( prevValue === null ) {
-						div.removeAttribute( key );
-						delete attrs[ key ];
-					} else {
-						div.setAttribute( key, prevValue );
-					}
-					throw store.error();
-				}
-			}
-			return ret;
-		});
-	}
-}() );
-
-// in-memory storage
-// fallback for all browsers to enable the API even if we can't persist data
-createSimpleStorage( "memory", {} );
-
-}( this.amplify = this.amplify || {} ) );