[hg] galaxy 2575: Implemented local storage for preferences, obs...

24 Aug 2009

details:   http://www.bx.psu.edu/hg/galaxy/rev/55c0eb35fad7
changeset: 2575:55c0eb35fad7
user:      Kanwei Li <kanwei@gmail.com>
date:      Thu Aug 13 13:16:58 2009 -0400
description:
Implemented local storage for preferences, obsoleting cookies that were used for this purpose

7 file(s) affected in this change:

static/jStore.Flash.html
static/jStore.swf
static/scripts/jquery.jstore-all.js
static/scripts/packed/jquery.jstore-all.js
static/scripts/packed/json2.js
templates/root/history.mako
templates/workflow/editor.mako

diffs (1380 lines):

diff -r 7df41ad788de -r 55c0eb35fad7 static/jStore.Flash.html

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/static/jStore.Flash.html	Thu Aug 13 13:16:58 2009 -0400
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+	<head>
+		<title>Flash External Object</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<script type="text/javascript">
+			/**
+			 * This function captures the flash_ready event. We need to relay this
+			 * back to the parent so it knows flash is ready.
+			 */
+			function flash_ready(){
+				parent.flash_ready();
+			}
+		</script>
+	</head>
+	<body>
+		<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#versio..." width="1" height="1" id="jStoreFlash"><param name="allowScriptAccess" value="always" /><param name="movie" value="jStore.swf" /><param name="quality" value="high" /><param name="bgcolor" value="#ffcc00" /><embed src="jStore.swf" quality="high" bgcolor="#ffcc00" width="1" height="1" name="jStoreFlash" align="middle" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" /></object>
+	</body>
+</html>
\ No newline at end of file
diff -r 7df41ad788de -r 55c0eb35fad7 static/jStore.swf
Binary file static/jStore.swf has changed
diff -r 7df41ad788de -r 55c0eb35fad7 static/scripts/jquery.jstore-all.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/static/scripts/jquery.jstore-all.js	Thu Aug 13 13:16:58 2009 -0400
@@ -0,0 +1,748 @@
+/*!
+ * jStore - Persistent Client-Side Storage
+ *
+ * Copyright (c) 2009 Eric Garside (http://eric.garside.name)
+ * 
+ * Dual licensed under:
+ * 	MIT: http://www.opensource.org/licenses/mit-license.php
+ *	GPLv3: http://www.opensource.org/licenses/gpl-3.0.html
+ *//**
+ * Javascript Class Framework
+ * 
+ * Copyright (c) 2008 John Resig (http://ejohn.org/blog/simple-javascript-inheritance/)
+ * Inspired by base2 and Prototype
+ */
+(function(){
+  var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
+
+  // The base Class implementation (does nothing)
+  this.Class = function(){};
+ 
+  // Create a new Class that inherits from this class
+  Class.extend = function(prop) {
+    var _super = this.prototype;
+   
+    // Instantiate a base class (but only create the instance,
+    // don't run the init constructor)
+    initializing = true;
+    var prototype = new this();
+    initializing = false;
+   
+    // Copy the properties over onto the new prototype
+    for (var name in prop) {
+      // Check if we're overwriting an existing function
+      prototype[name] = typeof prop[name] == "function" &&
+        typeof _super[name] == "function" && fnTest.test(prop[name]) ?
+        (function(name, fn){
+          return function() {
+            var tmp = this._super;
+           
+            // Add a new ._super() method that is the same method
+            // but on the super-class
+            this._super = _super[name];
+           
+            // The method only need to be bound temporarily, so we
+            // remove it when we're done executing
+            var ret = fn.apply(this, arguments);       
+            this._super = tmp;
+           
+            return ret;
+          };
+        })(name, prop[name]) :
+        prop[name];
+    }
+   
+    // The dummy class constructor
+    function Class() {
+      // All construction is actually done in the init method
+      if ( !initializing && this.init )
+        this.init.apply(this, arguments);
+    }
+   
+    // Populate our constructed prototype object
+    Class.prototype = prototype;
+   
+    // Enforce the constructor to be what we expect
+    Class.constructor = Class;
+
+    // And make this class extendable
+    Class.extend = arguments.callee;
+   
+    return Class;
+  };
+})();
+/*!
+ * jStore Delegate Framework
+ * Copyright (c) 2009 Eric Garside (http://eric.garside.name)
+ */
+(function($){
+	
+	this.jStoreDelegate = Class.extend({
+		init: function(parent){
+			// The Object this delgate operates for
+			this.parent = parent;
+			// Container for callbacks to dispatch.
+			// eventType => [ callback, callback, ... ]
+			this.callbacks = {};
+		},
+		bind: function(event, callback){
+			if ( !$.isFunction(callback) ) return this;
+			if ( !this.callbacks[ event ] ) this.callbacks[ event ] = [];
+			
+			this.callbacks[ event ].push(callback);
+			
+			return this;
+		},
+		trigger: function(){
+			var parent = this.parent,
+				args = [].slice.call(arguments),
+				event = args.shift(),
+				handlers = this.callbacks[ event ];
+
+			if ( !handlers ) return false;
+			
+			$.each(handlers, function(){ this.apply(parent, args) });
+			return this;
+		}
+	});
+	
+})(jQuery);/**
+ * jStore-jQuery Interface
+ * Copyright (c) 2009 Eric Garside (http://eric.garside.name)
+ */
+(function($){
+	
+	// Setup the jStore namespace in jQuery for options storage
+	$.jStore = {};
+	
+	// Seed the options in
+	$.extend($.jStore, {
+		EngineOrder: [],
+		// Engines should put their availability tests within jStore.Availability
+		Availability: {},
+		// Defined engines should enter themselves into the jStore.Engines
+		Engines: {},
+		// Instanciated engines should exist within jStore.Instances
+		Instances: {},
+		// The current engine to use for storage
+		CurrentEngine: null,
+		// Provide global settings for overwriting
+		defaults: {
+			project: null,
+			engine: null,
+			autoload: true,
+			flash: 'jStore.Flash.html'
+		},
+		// Boolean for ready state handling
+		isReady: false,
+		// Boolean for flash ready state handling
+		isFlashReady: false,
+		// An event delegate
+		delegate: new jStoreDelegate($.jStore)
+			.bind('jStore-ready', function(engine){
+				$.jStore.isReady = true;
+				if ($.jStore.defaults.autoload) engine.connect();
+			})
+			.bind('flash-ready', function(){
+				$.jStore.isFlashReady = true;
+			})			
+	});
+	
+	// Enable ready callback for jStore
+	$.jStore.ready = function(callback){
+		if ($.jStore.isReady) callback.apply($.jStore, [$.jStore.CurrentEngine]);
+		else $.jStore.delegate.bind('jStore-ready', callback);
+	}
+	
+	// Enable failure callback registration for jStore
+	$.jStore.fail = function(callback){
+		$.jStore.delegate.bind('jStore-failure', callback);
+	}
+	
+	// Enable ready callback for Flash
+	$.jStore.flashReady = function(callback){
+		if ($.jStore.isFlashReady) callback.apply($.jStore, [$.jStore.CurrentEngine]);
+		else $.jStore.delegate.bind('flash-ready', callback);
+	}
+	
+	// Enable and test an engine
+	$.jStore.use = function(engine, project, identifier){
+		project = project || $.jStore.defaults.project || location.hostname.replace(/\./g, '-') || 'unknown';
+		
+		var e = $.jStore.Engines[engine.toLowerCase()] || null,
+			name = (identifier ? identifier + '.' : '') + project + '.' + engine;
+		
+		if ( !e ) throw 'JSTORE_ENGINE_UNDEFINED';
+
+		// Instanciate the engine
+		e = new e(project, name);
+		
+		// Prevent against naming conflicts
+		if ($.jStore.Instances[name]) throw 'JSTORE_JRI_CONFLICT';
+		
+		// Test the engine
+		if (e.isAvailable()){
+			$.jStore.Instances[name] = e;	// The Easy Way
+			if (!$.jStore.CurrentEngine){
+				$.jStore.CurrentEngine = e;
+			}
+			$.jStore.delegate.trigger('jStore-ready', e);
+		} else {
+			if (!e.autoload)				// Not available
+				throw 'JSTORE_ENGINE_UNAVILABLE';
+			else { 							// The hard way
+				e.included(function(){
+					if (this.isAvailable()) { // Worked out
+						$.jStore.Instances[name] = this;
+						// If there is no current engine, use this one
+						if (!$.jStore.CurrentEngine){
+							$.jStore.CurrentEngine = this;
+						} 
+						$.jStore.delegate.trigger('jStore-ready', this);
+					}
+					else $.jStore.delegate.trigger('jStore-failure', this);
+				}).include();
+			}
+		}
+	}
+	
+	// Set the current storage engine
+	$.jStore.setCurrentEngine = function(name){
+		if (!$.jStore.Instances.length )				// If no instances exist, attempt to load one
+			return $.jStore.FindEngine();
+			
+		if (!name && $.jStore.Instances.length >= 1) { // If no name is specified, use the first engine
+			$.jStore.delegate.trigger('jStore-ready', $.jStore.Instances[0]);
+			return $.jStore.CurrentEngine = $.jStore.Instances[0];
+		}
+			
+		if (name && $.jStore.Instances[name]) { // If a name is specified and exists, use it
+			$.jStore.delegate.trigger('jStore-ready', $.jStore.Instances[name]);
+			return $.jStore.CurrentEngine = $.jStore.Instances[name];
+		}
+		
+		throw 'JSTORE_JRI_NO_MATCH';
+	}
+	
+	// Test all possible engines for straightforward useability
+	$.jStore.FindEngine = function(){
+		$.each($.jStore.EngineOrder, function(k){
+			if ($.jStore.Availability[this]()){ // Find the first, easiest option and use it.
+				$.jStore.use(this, $.jStore.defaults.project, 'default');
+				return false;
+			}
+		})
+	}
+	
+	// Provide a simple interface for storing/getting values
+	$.jStore.store = function(key, value){
+		if (!$.jStore.CurrentEngine) return false;
+		
+		if ( !value ) // Executing a get command
+			return $.jStore.CurrentEngine.get(key);
+		// Executing a set command
+			return $.jStore.CurrentEngine.set(key, value);
+	}
+	// Provide a simple interface for storing/getting values
+	$.jStore.remove = function(key){
+		if (!$.jStore.CurrentEngine) return false;
+		
+		return $.jStore.CurrentEngine.rem(key);
+	}
+	
+	// Provide a chainable interface for storing values/getting a value at the end of a chain
+	$.fn.store = function(key, value){
+		if (!$.jStore.CurrentEngine) return this;
+		
+		var result = $.jStore.store(key, value);
+		
+		return !value ? result : this;
+	}
+	
+	// Provide a chainable interface for removing values
+	$.fn.removeStore = function(key){
+		$.jStore.remove(key);
+		
+		return this;
+	}
+	
+	// Provide a way for users to call for auto-loading
+	$.jStore.load = function(){
+		if ($.jStore.defaults.engine)
+			return $.jStore.use($.jStore.defaults.engine, $.jStore.defaults.project, 'default');
+			
+		// Attempt to find a valid engine, and catch any exceptions if we can't
+		try {
+			$.jStore.FindEngine();
+		} catch (e) {}
+	}
+	
+})(jQuery);
+/**
+ * jStore Engine Core
+ * Copyright (c) 2009 Eric Garside (http://eric.garside.name)
+ */
+(function($){
+	
+	this.StorageEngine = Class.extend({
+		init: function(project, name){
+			// Configure the project name
+			this.project = project;
+			// The JRI name given by the manager
+			this.jri = name;
+			// Cache the data so we can work synchronously
+			this.data = {};
+			// The maximum limit of the storage engine
+			this.limit = -1;
+			// Third party script includes
+			this.includes = [];
+			// Create an event delegate for users to subscribe to event triggers
+			this.delegate = new jStoreDelegate(this)
+				.bind('engine-ready', function(){
+					this.isReady = true;
+				})
+				.bind('engine-included', function(){
+					this.hasIncluded = true;
+				});
+			// If enabled, the manager will check availability, then run include(), then check again
+			this.autoload = false; // This should be changed by the engines, if they have required includes
+			// When set, we're ready to transact data
+			this.isReady = false;
+			// When the includer is finished, it will set this to true
+			this.hasIncluded = false;
+		},
+		// Performs all necessary script includes
+		include: function(){
+			var self = this,
+				total = this.includes.length,
+				count = 0;
+				
+			$.each(this.includes, function(){
+				$.ajax({type: 'get', url: this, dataType: 'script', cache: true, 
+					success: function(){
+						count++;
+						if (count == total)	self.delegate.trigger('engine-included');
+					}
+				})
+			});
+		},
+		// This should be overloaded with an actual functionality presence check
+		isAvailable: function(){
+			return false;
+		},
+		/** Event Subscription Shortcuts **/
+		ready: function(callback){
+			if (this.isReady) callback.apply(this);
+			else this.delegate.bind('engine-ready', callback);
+			return this;
+		},
+		included: function(callback){
+			if (this.hasIncluded) callback.apply(this);
+			else this.delegate.bind('engine-included', callback);
+			return this;
+		},
+		/** Cache Data Access **/
+		get: function(key){
+			return this.data[key] || null;
+		},
+		set: function(key, value){
+			this.data[key] = value;
+			return value;
+		},
+		rem: function(key){
+			var beforeDelete = this.data[key];
+			this.data[key] = null;
+			return beforeDelete;			
+		}
+	});
+	
+})(jQuery);
+/*!
+ * jStore DOM Storage Engine
+ * Copyright (c) 2009 Eric Garside (http://eric.garside.name)
+ */
+(function($){
+	
+	// Set up a static test function for this instance
+	var sessionAvailability = $.jStore.Availability.session = function(){
+			return !!window.sessionStorage;
+		},
+		localAvailability = $.jStore.Availability.local = function(){
+			return !!(window.localStorage || window.globalStorage);
+		};
+
+	this.jStoreDom = StorageEngine.extend({
+		init: function(project, name){			
+			// Call the parental init object
+			this._super(project, name);
+			
+			// The type of storage engine
+			this.type = 'DOM';
+			
+			// Set the Database limit
+			this.limit = 5 * 1024 * 1024;
+		},
+		connect: function(){
+			// Fire our delegate to indicate we're ready for data transactions
+			this.delegate.trigger('engine-ready');
+		},
+		get: function(key){
+			var out = this.db.getItem(key);
+			// Gecko's getItem returns {value: 'the value'}, WebKit returns 'the value'
+			return out && out.value ? out.value : out
+		},
+		set: function(key, value){
+			this.db.setItem(key,value); 
+			return value;
+		},
+		rem: function(key){
+			var out = this.get(key); 
+			this.db.removeItem(key); 
+			return out
+		}
+	})
+	
+	this.jStoreLocal = jStoreDom.extend({
+		connect: function(){
+			// Gecko uses a non-standard globalStorage[ www.example.com ] DOM access object for persistant storage.
+			this.db = !window.globalStorage ? window.localStorage : window.globalStorage[location.hostname];
+			this._super();
+		},
+		isAvailable: localAvailability
+	})
+	
+	this.jStoreSession = jStoreDom.extend({
+		connect: function(){
+			this.db = sessionStorage;
+			this._super();
+		},
+		isAvailable: sessionAvailability
+	})
+
+	$.jStore.Engines.local = jStoreLocal;
+	$.jStore.Engines.session = jStoreSession;
+
+	// Store the ordering preference
+	$.jStore.EngineOrder[ 1 ] = 'local';
+
+})(jQuery);
+/*!
+ * jStore Flash Storage Engine
+ * Copyright (c) 2009 Eric Garside (http://eric.garside.name)
+ * jStore.swf Copyright (c) 2008 Daniel Bulli (http://www.nuff-respec.com)
+ */
+(function($){
+	
+	// Set up a static test function for this instance
+	var avilability = $.jStore.Availability.flash = function(){
+		return !!($.jStore.hasFlash('8.0.0'));
+	}
+	
+	this.jStoreFlash = StorageEngine.extend({
+		init: function(project, name){			
+			// Call the parental init object
+			this._super(project, name);
+			
+			// The type of storage engine
+			this.type = 'Flash';
+			
+			// Bind our flashReady function to the jStore Delegate
+			var self = this;
+			$.jStore.flashReady(function(){ self.flashReady() });
+		},
+		connect: function(){
+			var name = 'jstore-flash-embed-' + this.project;
+			
+			// To make Flash Storage work on IE, we have to load up an iFrame
+			// which contains an HTML page that embeds the object using an
+			// object tag wrapping an embed tag. Of course, this is unnecessary for
+			// all browsers except for IE, which, to my knowledge, is the only browser
+			// in existance where you need to complicate your code to fix bugs. Goddamnit. :(
+			$(document.body)
+				.append('<iframe style="height:1px;width:1px;position:absolute;left:0;top:0;margin-left:-100px;" ' + 
+					'id="jStoreFlashFrame" src="' +$.jStore.defaults.flash + '"></iframe>');
+		},
+		flashReady: function(e){
+			var iFrame = $('#jStoreFlashFrame')[0];
+			
+			// IE
+			if (iFrame.Document && $.isFunction(iFrame.Document['jStoreFlash'].f_get_cookie)) this.db = iFrame.Document['jStoreFlash'];
+			// Safari && Firefox
+			else if (iFrame.contentWindow && iFrame.contentWindow.document){
+				var doc = iFrame.contentWindow.document;
+				// Safari
+				if ($.isFunction($('object', $(doc))[0].f_get_cookie)) this.db = $('object', $(doc))[0];
+				// Firefox
+				else if ($.isFunction($('embed', $(doc))[0].f_get_cookie)) this.db = $('embed', $(doc))[0];
+			}
+
+			// We're ready to process data
+			if (this.db) this.delegate.trigger('engine-ready');
+		},
+		isAvailable: avilability,
+		get: function(key){
+			var out = this.db.f_get_cookie(key);
+			return out == 'null' ? null : out;
+		},
+		set: function(key, value){
+			this.db.f_set_cookie(key, value);
+			return value;
+		},
+		rem: function(key){
+			var beforeDelete = this.get(key);
+			this.db.f_delete_cookie(key);
+			return beforeDelete;
+		}
+	})
+
+	$.jStore.Engines.flash = jStoreFlash;
+
+	// Store the ordering preference
+	$.jStore.EngineOrder[ 2 ] = 'flash';
+
+	/**
+ 	 * Flash Detection functions copied from the jQuery Flash Plugin
+ 	 * Copyright (c) 2006 Luke Lutman (http://jquery.lukelutman.com/plugins/flash)
+ 	 * Dual licensed under the MIT and GPL licenses.
+ 	 * 	http://www.opensource.org/licenses/mit-license.php
+ 	 * 	http://www.opensource.org/licenses/gpl-license.php 
+ 	 */
+	$.jStore.hasFlash = function(version){
+		var pv = $.jStore.flashVersion().match(/\d+/g),
+			rv = version.match(/\d+/g);
+
+		for(var i = 0; i < 3; i++) {
+			pv[i] = parseInt(pv[i] || 0);
+			rv[i] = parseInt(rv[i] || 0);
+			// player is less than required
+			if(pv[i] < rv[i]) return false;
+			// player is greater than required
+			if(pv[i] > rv[i]) return true;
+		}
+		// major version, minor version and revision match exactly
+		return true;
+	}
+	
+	$.jStore.flashVersion = function(){
+		// ie
+		try {
+			try {
+				// avoid fp6 minor version lookup issues
+				// see: http://blog.deconcept.com/2006/01/11/getvariable-setvariable-crash-internet-...
+				var axo = new ActiveXObject('ShockwaveFlash.ShockwaveFlash.6');
+				try { axo.AllowScriptAccess = 'always';	} 
+				catch(e) { return '6,0,0'; }				
+			} catch(e) {}
+				return new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version').replace(/\D+/g, ',').match(/^,?(.+),?$/)[1];
+		// other browsers
+		} catch(e) {
+			try {
+				if(navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin){
+					return (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]).description.replace(/\D+/g, ",").match(/^,?(.+),?$/)[1];
+				}
+			} catch(e) {}		
+		}
+		return '0,0,0';
+	}
+
+})(jQuery);
+
+// Callback fired when ExternalInterface is established
+function flash_ready(){
+	$.jStore.delegate.trigger('flash-ready');
+}
+/*!
+ * jStore Google Gears Storage Engine
+ * Copyright (c) 2009 Eric Garside (http://eric.garside.name)
+ */
+(function($){
+	
+	// Set up a static test function for this instance
+	var avilability = $.jStore.Availability.gears = function(){
+		return !!(window.google && window.google.gears)
+	}
+	
+	this.jStoreGears = StorageEngine.extend({
+		init: function(project, name){			
+			// Call the parental init object
+			this._super(project, name);
+			
+			// The type of storage engine
+			this.type = 'Google Gears';
+			
+			// Add required third-party scripts
+			this.includes.push('http://code.google.com/apis/gears/gears_init.js');
+			
+			// Allow Autoloading on fail
+			this.autoload = true;
+		},
+		connect: function(){
+			// Create our database connection
+			var db = this.db = google.gears.factory.create('beta.database');
+			db.open( 'jstore-' + this.project );
+			db.execute( 'CREATE TABLE IF NOT EXISTS jstore (k TEXT UNIQUE NOT NULL PRIMARY KEY, v TEXT NOT NULL)' );
+			
+			// Cache the data from the table
+			this.updateCache();
+		},
+		updateCache: function(){
+			// Read the database into our cache object
+			var result = this.db.execute( 'SELECT k,v FROM jstore' );
+			while (result.isValidRow()){
+				this.data[result.field(0)] = result.field(1);
+				result.next();
+			} result.close();
+			
+			// Fire our delegate to indicate we're ready for data transactions
+			this.delegate.trigger('engine-ready');
+		},
+		isAvailable: avilability,
+		set: function(key, value){
+			// Update the database
+			var db = this.db;
+			db.execute( 'BEGIN' );
+			db.execute( 'INSERT OR REPLACE INTO jstore(k, v) VALUES (?, ?)', [key,value] );
+			db.execute( 'COMMIT' );
+			return this._super(key, value);
+		},
+		rem: function(key){
+			// Update the database
+			var db = this.db;
+			db.execute( 'BEGIN' );
+			db.execute( 'DELETE FROM jstore WHERE k = ?', [key] );
+			db.execute( 'COMMIT' );
+			return this._super(key);
+		}
+	})
+
+	$.jStore.Engines.gears = jStoreGears;
+	
+	// Store the ordering preference
+	$.jStore.EngineOrder[ 3 ] = 'gears';
+
+})(jQuery);
+/*!
+ * jStore HTML5 Specification Storage Engine
+ * Copyright (c) 2009 Eric Garside (http://eric.garside.name)
+ */
+(function($){
+	
+	// Set up a static test function for this instance
+	var avilability = $.jStore.Availability.html5 = function(){
+		return !!window.openDatabase
+	}
+	
+	this.jStoreHtml5 = StorageEngine.extend({
+		init: function(project, name){			
+			// Call the parental init object
+			this._super(project, name);
+			
+			// The type of storage engine
+			this.type = 'HTML5';
+			
+			// Set the Database limit
+			this.limit = 1024 * 200;
+		},
+		connect: function(){
+			// Create our database connection
+			var db = this.db = openDatabase('jstore-' + this.project, '1.0', this.project, this.limit);
+			if (!db) throw 'JSTORE_ENGINE_HTML5_NODB';
+			db.transaction(function(db){
+				db.executeSql( 'CREATE TABLE IF NOT EXISTS jstore (k TEXT UNIQUE NOT NULL PRIMARY KEY, v TEXT NOT NULL)' );
+			});
+			
+			// Cache the data from the table
+			this.updateCache();
+		},
+		updateCache: function(){
+			var self = this;
+			// Read the database into our cache object
+			this.db.transaction(function(db){
+				db.executeSql( 'SELECT k,v FROM jstore', [], function(db, result){
+					var rows = result.rows, i = 0, row;
+					for (; i < rows.length; ++i){
+						row = rows.item(i);
+						self.data[row.k] = row.v;
+					}
+					
+					// Fire our delegate to indicate we're ready for data transactions
+					self.delegate.trigger('engine-ready');
+				});
+			});
+		},
+		isAvailable: avilability,
+		set: function(key, value){
+			// Update the database
+			this.db.transaction(function(db){
+				db.executeSql( 'INSERT OR REPLACE INTO jstore(k, v) VALUES (?, ?)', [key,value]);
+			});
+			return this._super(key, value);
+		},
+		rem: function(key){
+			// Update the database
+			this.db.transaction(function(db){
+				db.executeSql( 'DELETE FROM jstore WHERE k = ?', [key] )
+			})
+			return this._super(key);
+		}
+	})
+
+	$.jStore.Engines.html5 = jStoreHtml5;
+
+	// Store the ordering preference
+	$.jStore.EngineOrder[ 0 ] = 'html5';
+
+})(jQuery);
+/*!*
+ * jStore IE Storage Engine
+ * Copyright (c) 2009 Eric Garside (http://eric.garside.name)
+ */
+(function($){
+	
+	// Set up a static test function for this instance
+	var avilability = $.jStore.Availability.ie = function(){
+		return !!window.ActiveXObject;
+	}
+	
+	this.jStoreIE = StorageEngine.extend({
+		init: function(project, name){			
+			// Call the parental init object
+			this._super(project, name);
+			
+			// The type of storage engine
+			this.type = 'IE';
+			
+			// Allow Autoloading on fail
+			this.limit = 64 * 1024;
+		},
+		connect: function(){
+			// Create a hidden div to store attributes in
+			this.db = $('<div style="display:none;behavior:url(\'#default#userData\')" id="jstore-' + this.project + '"></div>')
+						.appendTo(document.body).get(0);
+			// Fire our delegate to indicate we're ready for data transactions
+			this.delegate.trigger('engine-ready');
+		},
+		isAvailable: avilability,
+		get: function(key){
+			this.db.load(this.project);
+			return this.db.getAttribute(key);
+		},
+		set: function(key, value){
+			this.db.setAttribute(key, value);
+			this.db.save(this.project);
+			return value;
+		},
+		rem: function(key){
+			var beforeDelete = this.get(key);
+			this.db.removeAttribute(key);
+			this.db.save(this.project);
+			return beforeDelete;
+		}
+	})
+
+	$.jStore.Engines.ie = jStoreIE;
+	
+	// Store the ordering preference
+	$.jStore.EngineOrder[ 4 ] = 'ie';
+
+})(jQuery);
\ No newline at end of file
diff -r 7df41ad788de -r 55c0eb35fad7 static/scripts/packed/jquery.jstore-all.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/static/scripts/packed/jquery.jstore-all.js	Thu Aug 13 13:16:58 2009 -0400
@@ -0,0 +1,41 @@
+/*
+ * jStore - Persistent Client-Side Storage
+ *
+ * Copyright (c) 2009 Eric Garside (http://eric.garside.name)
+ * 
+ * Dual licensed under:
+ * 	MIT: http://www.opensource.org/licenses/mit-license.php
+ *	GPLv3: http://www.opensource.org/licenses/gpl-3.0.html
+ */
+(function(){var a=false,b=/xyz/.test(function(){xyz})?/\b_super\b/:/.*/;this.Class=function(){};Class.extend=function(g){var f=this.prototype;a=true;var e=new this();a=false;for(var d in g){e[d]=typeof g[d]=="function"&&typeof f[d]=="function"&&b.test(g[d])?(function(h,i){return function(){var k=this._super;this._super=f[h];var j=i.apply(this,arguments);this._super=k;return j}})(d,g[d]):g[d]}function c(){if(!a&&this.init){this.init.apply(this,arguments)}}c.prototype=e;c.constructor=c;c.extend=arguments.callee;return c}})();
+/*
+ * jStore Delegate Framework
+ * Copyright (c) 2009 Eric Garside (http://eric.garside.name)
+ */
+(function(a){this.jStoreDelegate=Class.extend({init:function(b){this.parent=b;this.callbacks={}},bind:function(b,c){if(!a.isFunction(c)){return this}if(!this.callbacks[b]){this.callbacks[b]=[]}this.callbacks[b].push(c);return this},trigger:function(){var d=this.parent,c=[].slice.call(arguments),e=c.shift(),b=this.callbacks[e];if(!b){return false}a.each(b,function(){this.apply(d,c)});return this}})})(jQuery);(function(a){a.jStore={};a.extend(a.jStore,{EngineOrder:[],Availability:{},Engines:{},Instances:{},CurrentEngine:null,defaults:{project:null,engine:null,autoload:true,flash:"jStore.Flash.html"},isReady:false,isFlashReady:false,delegate:new jStoreDelegate(a.jStore).bind("jStore-ready",function(b){a.jStore.isReady=true;if(a.jStore.defaults.autoload){b.connect()}}).bind("flash-ready",function(){a.jStore.isFlashReady=true})});a.jStore.ready=function(b){if(a.jStore.isReady){b.apply(a.jStore,[a.jStore.CurrentEngine])}else{a.jStore.delegate.bind("jStore-ready",b)}};a.jStore.fail
 =function(b){a.jStore.delegate.bind("jStore-failure",b)};a.jStore.flashReady=function(b){if(a.jStore.isFlashReady){b.apply(a.jStore,[a.jStore.CurrentEngine])}else{a.jStore.delegate.bind("flash-ready",b)}};a.jStore.use=function(d,g,c){g=g||a.jStore.defaults.project||location.hostname.replace(/\./g,"-")||"unknown";var f=a.jStore.Engines[d.toLowerCase()]||null,b=(c?c+".":"")+g+"."+d;if(!f){throw"JSTORE_ENGINE_UNDEFINED"}f=new f(g,b);if(a.jStore.Instances[b]){throw"JSTORE_JRI_CONFLICT"}if(f.isAvailable()){a.jStore.Instances[b]=f;if(!a.jStore.CurrentEngine){a.jStore.CurrentEngine=f}a.jStore.delegate.trigger("jStore-ready",f)}else{if(!f.autoload){throw"JSTORE_ENGINE_UNAVILABLE"}else{f.included(function(){if(this.isAvailable()){a.jStore.Instances[b]=this;if(!a.jStore.CurrentEngine){a.jStore.CurrentEngine=this}a.jStore.delegate.trigger("jStore-ready",this)}else{a.jStore.delegate.trigger("jStore-failure",this)}}).include()}}};a.jStore.setCurrentEngine=function(b){if(!a.jStore.Instanc
 es.length){return a.jStore.FindEngine()}if(!b&&a.jStore.Instances.length>=1){a.jStore.delegate.trigger("jStore-ready",a.jStore.Instances[0]);return a.jStore.CurrentEngine=a.jStore.Instances[0]}if(b&&a.jStore.Instances[b]){a.jStore.delegate.trigger("jStore-ready",a.jStore.Instances[b]);return a.jStore.CurrentEngine=a.jStore.Instances[b]}throw"JSTORE_JRI_NO_MATCH"};a.jStore.FindEngine=function(){a.each(a.jStore.EngineOrder,function(b){if(a.jStore.Availability[this]()){a.jStore.use(this,a.jStore.defaults.project,"default");return false}})};a.jStore.store=function(b,c){if(!a.jStore.CurrentEngine){return false}if(!c){return a.jStore.CurrentEngine.get(b)}return a.jStore.CurrentEngine.set(b,c)};a.jStore.remove=function(b){if(!a.jStore.CurrentEngine){return false}return a.jStore.CurrentEngine.rem(b)};a.fn.store=function(c,d){if(!a.jStore.CurrentEngine){return this}var b=a.jStore.store(c,d);return !d?b:this};a.fn.removeStore=function(b){a.jStore.remove(b);return this};a.jStore.load=f
 unction(){if(a.jStore.defaults.engine){return a.jStore.use(a.jStore.defaults.engine,a.jStore.defaults.project,"default")}try{a.jStore.FindEngine()}catch(b){}}})(jQuery);(function(a){this.StorageEngine=Class.extend({init:function(c,b){this.project=c;this.jri=b;this.data={};this.limit=-1;this.includes=[];this.delegate=new jStoreDelegate(this).bind("engine-ready",function(){this.isReady=true}).bind("engine-included",function(){this.hasIncluded=true});this.autoload=false;this.isReady=false;this.hasIncluded=false},include:function(){var b=this,d=this.includes.length,c=0;a.each(this.includes,function(){a.ajax({type:"get",url:this,dataType:"script",cache:true,success:function(){c++;if(c==d){b.delegate.trigger("engine-included")}}})})},isAvailable:function(){return false},ready:function(b){if(this.isReady){b.apply(this)}else{this.delegate.bind("engine-ready",b)}return this},included:function(b){if(this.hasIncluded){b.apply(this)}else{this.delegate.bind("engine-included",b)}return th
 is},get:function(b){return this.data[b]||null},set:function(b,c){this.data[b]=c;return c},rem:function(b){var c=this.data[b];this.data[b]=null;return c}})})(jQuery);
+/*
+ * jStore DOM Storage Engine
+ * Copyright (c) 2009 Eric Garside (http://eric.garside.name)
+ */
+(function(c){var b=c.jStore.Availability.session=function(){return !!window.sessionStorage},a=c.jStore.Availability.local=function(){return !!(window.localStorage||window.globalStorage)};this.jStoreDom=StorageEngine.extend({init:function(e,d){this._super(e,d);this.type="DOM";this.limit=5*1024*1024},connect:function(){this.delegate.trigger("engine-ready")},get:function(e){var d=this.db.getItem(e);return d&&d.value?d.value:d},set:function(d,e){this.db.setItem(d,e);return e},rem:function(e){var d=this.get(e);this.db.removeItem(e);return d}});this.jStoreLocal=jStoreDom.extend({connect:function(){this.db=!window.globalStorage?window.localStorage:window.globalStorage[location.hostname];this._super()},isAvailable:a});this.jStoreSession=jStoreDom.extend({connect:function(){this.db=sessionStorage;this._super()},isAvailable:b});c.jStore.Engines.local=jStoreLocal;c.jStore.Engines.session=jStoreSession;c.jStore.EngineOrder[1]="local"})(jQuery);
+/*
+ * jStore Flash Storage Engine
+ * Copyright (c) 2009 Eric Garside (http://eric.garside.name)
+ * jStore.swf Copyright (c) 2008 Daniel Bulli (http://www.nuff-respec.com)
+ */
+(function(b){var a=b.jStore.Availability.flash=function(){return !!(b.jStore.hasFlash("8.0.0"))};this.jStoreFlash=StorageEngine.extend({init:function(e,d){this._super(e,d);this.type="Flash";var c=this;b.jStore.flashReady(function(){c.flashReady()})},connect:function(){var c="jstore-flash-embed-"+this.project;b(document.body).append('<iframe style="height:1px;width:1px;position:absolute;left:0;top:0;margin-left:-100px;" id="jStoreFlashFrame" src="'+b.jStore.defaults.flash+'"></iframe>')},flashReady:function(f){var c=b("#jStoreFlashFrame")[0];if(c.Document&&b.isFunction(c.Document.jStoreFlash.f_get_cookie)){this.db=c.Document.jStoreFlash}else{if(c.contentWindow&&c.contentWindow.document){var d=c.contentWindow.document;if(b.isFunction(b("object",b(d))[0].f_get_cookie)){this.db=b("object",b(d))[0]}else{if(b.isFunction(b("embed",b(d))[0].f_get_cookie)){this.db=b("embed",b(d))[0]}}}}if(this.db){this.delegate.trigger("engine-ready")}},isAvailable:a,get:function(d){var c=this.db.f_g
 et_cookie(d);return c=="null"?null:c},set:function(c,d){this.db.f_set_cookie(c,d);return d},rem:function(c){var d=this.get(c);this.db.f_delete_cookie(c);return d}});b.jStore.Engines.flash=jStoreFlash;b.jStore.EngineOrder[2]="flash";b.jStore.hasFlash=function(c){var e=b.jStore.flashVersion().match(/\d+/g),f=c.match(/\d+/g);for(var d=0;d<3;d++){e[d]=parseInt(e[d]||0);f[d]=parseInt(f[d]||0);if(e[d]<f[d]){return false}if(e[d]>f[d]){return true}}return true};b.jStore.flashVersion=function(){try{try{var c=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");try{c.AllowScriptAccess="always"}catch(d){return"6,0,0"}}catch(d){}return new ActiveXObject("ShockwaveFlash.ShockwaveFlash").GetVariable("$version").replace(/\D+/g,",").match(/^,?(.+),?$/)[1]}catch(d){try{if(navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin){return(navigator.plugins["Shockwave Flash 2.0"]||navigator.plugins["Shockwave Flash"]).description.replace(/\D+/g,",").match(/^,?(.+),?$/)[1]}}catch(d){}}r
 eturn"0,0,0"}})(jQuery);function flash_ready(){$.jStore.delegate.trigger("flash-ready")}
+/*
+ * jStore Google Gears Storage Engine
+ * Copyright (c) 2009 Eric Garside (http://eric.garside.name)
+ */
+(function(b){var a=b.jStore.Availability.gears=function(){return !!(window.google&&window.google.gears)};this.jStoreGears=StorageEngine.extend({init:function(d,c){this._super(d,c);this.type="Google Gears";this.includes.push("http://code.google.com/apis/gears/gears_init.js");this.autoload=true},connect:function(){var c=this.db=google.gears.factory.create("beta.database");c.open("jstore-"+this.project);c.execute("CREATE TABLE IF NOT EXISTS jstore (k TEXT UNIQUE NOT NULL PRIMARY KEY, v TEXT NOT NULL)");this.updateCache()},updateCache:function(){var c=this.db.execute("SELECT k,v FROM jstore");while(c.isValidRow()){this.data[c.field(0)]=c.field(1);c.next()}c.close();this.delegate.trigger("engine-ready")},isAvailable:a,set:function(d,e){var c=this.db;c.execute("BEGIN");c.execute("INSERT OR REPLACE INTO jstore(k, v) VALUES (?, ?)",[d,e]);c.execute("COMMIT");return this._super(d,e)},rem:function(d){var c=this.db;c.execute("BEGIN");c.execute("DELETE FROM jstore WHERE k = ?",[d]);c.ex
 ecute("COMMIT");return this._super(d)}});b.jStore.Engines.gears=jStoreGears;b.jStore.EngineOrder[3]="gears"})(jQuery);
+/*
+ * jStore HTML5 Specification Storage Engine
+ * Copyright (c) 2009 Eric Garside (http://eric.garside.name)
+ */
+(function(b){var a=b.jStore.Availability.html5=function(){return !!window.openDatabase};this.jStoreHtml5=StorageEngine.extend({init:function(d,c){this._super(d,c);this.type="HTML5";this.limit=1024*200},connect:function(){var c=this.db=openDatabase("jstore-"+this.project,"1.0",this.project,this.limit);if(!c){throw"JSTORE_ENGINE_HTML5_NODB"}c.transaction(function(d){d.executeSql("CREATE TABLE IF NOT EXISTS jstore (k TEXT UNIQUE NOT NULL PRIMARY KEY, v TEXT NOT NULL)")});this.updateCache()},updateCache:function(){var c=this;this.db.transaction(function(d){d.executeSql("SELECT k,v FROM jstore",[],function(f,e){var h=e.rows,g=0,j;for(;g<h.length;++g){j=h.item(g);c.data[j.k]=j.v}c.delegate.trigger("engine-ready")})})},isAvailable:a,set:function(c,d){this.db.transaction(function(e){e.executeSql("INSERT OR REPLACE INTO jstore(k, v) VALUES (?, ?)",[c,d])});return this._super(c,d)},rem:function(c){this.db.transaction(function(d){d.executeSql("DELETE FROM jstore WHERE k = ?",[c])});ret
 urn this._super(c)}});b.jStore.Engines.html5=jStoreHtml5;b.jStore.EngineOrder[0]="html5"})(jQuery);
+/**
+ * jStore IE Storage Engine
+ * Copyright (c) 2009 Eric Garside (http://eric.garside.name)
+ */
+(function(b){var a=b.jStore.Availability.ie=function(){return !!window.ActiveXObject};this.jStoreIE=StorageEngine.extend({init:function(d,c){this._super(d,c);this.type="IE";this.limit=64*1024},connect:function(){this.db=b('<div style="display:none;behavior:url(\'#default#userData\')" id="jstore-'+this.project+'"></div>').appendTo(document.body).get(0);this.delegate.trigger("engine-ready")},isAvailable:a,get:function(c){this.db.load(this.project);return this.db.getAttribute(c)},set:function(c,d){this.db.setAttribute(c,d);this.db.save(this.project);return d},rem:function(c){var d=this.get(c);this.db.removeAttribute(c);this.db.save(this.project);return d}});b.jStore.Engines.ie=jStoreIE;b.jStore.EngineOrder[4]="ie"})(jQuery);
\ No newline at end of file
diff -r 7df41ad788de -r 55c0eb35fad7 static/scripts/packed/json2.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/static/scripts/packed/json2.js	Thu Aug 13 13:16:58 2009 -0400
@@ -0,0 +1,1 @@
+var JSON=JSON||{};(function(){function f(n){return n<10?"0"+n:n}if(typeof Date.prototype.toJSON!=="function"){Date.prototype.toJSON=function(key){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null};String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(key){return this.valueOf()}}var cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,escapable=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,gap,indent,meta={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},rep;function quote(string){escapable.lastIndex=0;return escapable.test(string)?'"'+string.replace(escapable,function(a){var c=meta[a];return typeof c==="string"?c:"\\u"+("0000"+a.charCodeAt(0)
 .toString(16)).slice(-4)})+'"':'"'+string+'"'}function str(key,holder){var i,k,v,length,mind=gap,partial,value=holder[key];if(value&&typeof value==="object"&&typeof value.toJSON==="function"){value=value.toJSON(key)}if(typeof rep==="function"){value=rep.call(holder,key,value)}switch(typeof value){case"string":return quote(value);case"number":return isFinite(value)?String(value):"null";case"boolean":case"null":return String(value);case"object":if(!value){return"null"}gap+=indent;partial=[];if(Object.prototype.toString.apply(value)==="[object Array]"){length=value.length;for(i=0;i<length;i+=1){partial[i]=str(i,value)||"null"}v=partial.length===0?"[]":gap?"[\n"+gap+partial.join(",\n"+gap)+"\n"+mind+"]":"["+partial.join(",")+"]";gap=mind;return v}if(rep&&typeof rep==="object"){length=rep.length;for(i=0;i<length;i+=1){k=rep[i];if(typeof k==="string"){v=str(k,value);if(v){partial.push(quote(k)+(gap?": ":":")+v)}}}}else{for(k in value){if(Object.hasOwnProperty.call(value,k)){v=str(
 k,value);if(v){partial.push(quote(k)+(gap?": ":":")+v)}}}}v=partial.length===0?"{}":gap?"{\n"+gap+partial.join(",\n"+gap)+"\n"+mind+"}":"{"+partial.join(",")+"}";gap=mind;return v}}if(typeof JSON.stringify!=="function"){JSON.stringify=function(value,replacer,space){var i;gap="";indent="";if(typeof space==="number"){for(i=0;i<space;i+=1){indent+=" "}}else{if(typeof space==="string"){indent=space}}rep=replacer;if(replacer&&typeof replacer!=="function"&&(typeof replacer!=="object"||typeof replacer.length!=="number")){throw new Error("JSON.stringify")}return str("",{"":value})}}if(typeof JSON.parse!=="function"){JSON.parse=function(text,reviver){var j;function walk(holder,key){var k,v,value=holder[key];if(value&&typeof value==="object"){for(k in value){if(Object.hasOwnProperty.call(value,k)){v=walk(value,k);if(v!==undefined){value[k]=v}else{delete value[k]}}}}return reviver.call(holder,key,value)}cx.lastIndex=0;if(cx.test(text)){text=text.replace(cx,function(a){return"\\u"+("000
 0"+a.charCodeAt(0).toString(16)).slice(-4)})}if(/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))){j=eval("("+text+")");return typeof reviver==="function"?walk({"":j},""):j}throw new SyntaxError("JSON.parse")}}}());
\ No newline at end of file
diff -r 7df41ad788de -r 55c0eb35fad7 templates/root/history.mako
--- a/templates/root/history.mako	Tue Aug 11 15:46:23 2009 -0400
+++ b/templates/root/history.mako	Thu Aug 13 13:16:58 2009 -0400
@@ -15,219 +15,242 @@
 <meta http-equiv="Pragma" content="no-cache">
 
 ${h.css( "base", "history" )}
-${h.js( "jquery", "jquery.cookie", "cookie_set" )}
-  
+${h.js( "jquery", "json2", "jquery.jstore-all" )}
+
 <script type="text/javascript">
-    $( document ).ready( function() {
-        initShowHide();
-        setupHistoryItem( $("div.historyItemWrapper") );
-        // Collapse all
-        $("#top-links").append( "| " ).append( $("<a href='#'>${_('collapse all')}</a>").click( function() {
-            $( "div.historyItemBody:visible" ).each( function() {
-                if ( $.browser.mozilla )
-                {
-                    $(this).find( "pre.peek" ).css( "overflow", "hidden" );
+$(function() {
+    // Load jStore for local storage
+    $.extend(jQuery.jStore.defaults, { project: 'galaxy', flash: '/static/jStore.Flash.html' })
+    $.jStore.load(); // Auto-select best storage
+
+    $.jStore.ready(function(engine) {
+        engine.ready(function() {
+            // Init stuff that requires the local storage to be running
+            initShowHide();
+            setupHistoryItem( $("div.historyItemWrapper") ); 
+        });
+    });
+    
+    // Generate 'collapse all' link
+    $("#top-links").append( "| " ).append( $("<a href='#'>${_('collapse all')}</a>").click( function() {
+        $( "div.historyItemBody:visible" ).each( function() {
+            if ( $.browser.mozilla ) {
+                $(this).find( "pre.peek" ).css( "overflow", "hidden" );
+            }
+            $(this).slideUp( "fast" );
+        });
+        $.jStore.remove("history_expand_state");
+    }));
+    
+    $("#history-rename").click( function() {
+        var old_name = $("#history-name").text()
+        var t = $("<input type='text' value='" + old_name + "'></input>" );
+        t.blur( function() {
+            $(this).remove();
+            $("#history-name").show();
+        });
+        t.keyup( function( e ) {
+            if ( e.keyCode == 27 ) {
+                // Escape key
+                $(this).trigger( "blur" );
+            } else if ( e.keyCode == 13 ) {
+                // Enter key
+                new_value = this.value;
+                $(this).trigger( "blur" );
+                $.ajax({
+                    url: "${h.url_for( controller='history', action='rename_async', id=history.id )}",
+                    data: { "_": true, new_name: new_value },
+                    error: function() { alert( "Rename failed" ) },
+                    success: function() {
+                        $("#history-name").text( new_value );
+                    }
+                });
+            }
+        });
+        $("#history-name").hide();
+        $("#history-name-area").append( t );
+        t.focus();
+        return false;
+    });
+    // Updater
+    updater({
+        %for i, data in enumerate( reversed( datasets ) ):
+        %if data.visible and data.state not in [ "deleted", "empty", "error", "ok" ]:
+        %if i > 0:
+        ,
+        %endif
+        "${data.id}": "${data.state}"
+        %endif
+        %endfor
+    });
+});
+// Functionized so AJAX'd datasets can call them
+// Get shown/hidden state from cookie
+function initShowHide() {
+
+    // Load saved state and show as neccesary
+    try {
+        var stored = $.jStore.store("history_expand_state");
+        if (stored) {
+            var st = JSON.parse(stored);
+            for (var id in st) {
+                $("#" + id + " div.historyItemBody" ).show();
+            }
+        }
+    } catch(err) {
+        // Something was wrong with values in storage, so clear storage
+        $.jStore.remove("history_expand_state");
+    }
+
+    // If Mozilla, hide scrollbars in hidden items since they cause animation bugs
+    if ( $.browser.mozilla ) {
+        $( "div.historyItemBody" ).each( function() {
+            if ( ! $(this).is( ":visible" ) ) $(this).find( "pre.peek" ).css( "overflow", "hidden" );
+        })
+    }
+}
+// Add show/hide link and delete link to a history item
+function setupHistoryItem( query ) {
+    query.each( function() {
+        var id = this.id;
+        var body = $(this).children( "div.historyItemBody" );
+        var peek = body.find( "pre.peek" )
+        $(this).children( ".historyItemTitleBar" ).find( ".historyItemTitle" ).wrap( "<a href='#'></a>" ).click( function() {
+            if ( body.is(":visible") ) {
+                // Hiding stuff here
+                if ( $.browser.mozilla ) { peek.css( "overflow", "hidden" ) }
+                body.slideUp( "fast" );
+                
+                // Save setting
+                var stored = $.jStore.store("history_expand_state")
+                var prefs = stored ? JSON.parse(stored) : null
+                if (prefs) {
+                    delete prefs[id];
+                    $.jStore.store("history_expand_state", JSON.stringify(prefs));
                 }
-                $(this).slideUp( "fast" );
-            })
-            var state = new CookieSet( "galaxy.history.expand_state" );
-            state.removeAll().save();
-        return false;
-        }));
-	$("#history-rename").click( function() {
-	    var old_name = $("#history-name").text()
-	    var t = $("<input type='text' value='" + old_name + "'></input>" );
-	    t.blur( function() {
-		$(this).remove();
-		$("#history-name").show();
-	    });
-	    t.keyup( function( e ) {
-		if ( e.keyCode == 27 ) {
-		    // Escape key
-			$(this).trigger( "blur" );
-		} else if ( e.keyCode == 13 ) {
-		    // Enter key
-		    new_value = this.value;
-		    $(this).trigger( "blur" );
-		    $.ajax({
-			url: "${h.url_for( controller='history', action='rename_async', id=history.id )}",
-			data: { "_": true, new_name: new_value },
-			error: function() { alert( "Rename failed" ) },
-			success: function() {
-			    $("#history-name").text( new_value );
-			}
-		    });
-		}
-	    });
-	    $("#history-name").hide();
-	    $("#history-name-area").append( t );
-	    t.focus();
-	    return false;
-	});
-        // Updater
-        updater({
-            %for i, data in enumerate( reversed( datasets ) ):
-                %if data.visible and data.state not in [ "deleted", "empty", "error", "ok" ]:
-                    %if i > 0:
-                    ,
-                    %endif
-                    "${data.id}": "${data.state}"
-                %endif
-            %endfor
+            } 
+            else {
+                // Showing stuff here
+                body.slideDown( "fast", function() { 
+                    if ( $.browser.mozilla ) { peek.css( "overflow", "auto" ); } 
+                });
+                
+                // Save setting
+                var stored = $.jStore.store("history_expand_state")
+                var prefs = stored ? JSON.parse(stored) : new Object;
+                prefs[id] = true;
+                $.jStore.store("history_expand_state", JSON.stringify(prefs));
+            }
+            return false;
         });
-    })
-    //' Functionized so AJAX'd datasets can call them
-    // Get shown/hidden state from cookie
-    function initShowHide() {
-        // $( "div.historyItemBody" ).hide();
-        // Load saved state and show as neccesary
-        var state = new CookieSet( "galaxy.history.expand_state" );
-	for ( id in state.store ) {
-	    if ( id ) {
-		$( "#" + id + " div.historyItemBody" ).show();
-	    }
-	}
-        // If Mozilla, hide scrollbars in hidden items since they cause animation bugs
-        if ( $.browser.mozilla ) {
-            $( "div.historyItemBody" ).each( function() {
-                if ( ! $(this).is( ":visible" ) ) $(this).find( "pre.peek" ).css( "overflow", "hidden" );
-            })
-        }
-        delete state;
-    }
-    // Add show/hide link and delete link to a history item
-    function setupHistoryItem( query ) {
-        query.each( function() {
-            var id = this.id;
-            var body = $(this).children( "div.historyItemBody" );
-            var peek = body.find( "pre.peek" )
-            $(this).children( ".historyItemTitleBar" ).find( ".historyItemTitle" ).wrap( "<a href='#'></a>" ).click( function() {
-                if ( body.is(":visible") ) {
-                    if ( $.browser.mozilla ) { peek.css( "overflow", "hidden" ) }
-                    body.slideUp( "fast" );
-                    ## other instances of this could be editing the cookie, refetch
-                    var state = new CookieSet( "galaxy.history.expand_state" );
-                    state.remove( id ); state.save();
-                    delete state;
-                } 
-                else {
-                    body.slideDown( "fast", function() { 
-                        if ( $.browser.mozilla ) { peek.css( "overflow", "auto" ); } 
-                    });
-                    var state = new CookieSet( "galaxy.history.expand_state" );
-                    state.add( id ); state.save();
-                    delete state;
-                }
+        // Delete link
+        $(this).find( "div.historyItemButtons > .delete" ).each( function() {
+            var data_id = this.id.split( "-" )[1];
+            $(this).click( function() {
+                $( '#historyItem-' + data_id + "> div.historyItemTitleBar" ).addClass( "spinner" );
+                $.ajax({
+                    url: "${h.url_for( action='delete_async', id='XXX' )}".replace( 'XXX', data_id ),
+                    error: function() { alert( "Delete failed" ) },
+                    success: function() {
+                        %if show_deleted:
+                        var to_update = {};
+                        to_update[data_id] = "none";
+                        updater( to_update );
+                        %else:
+                        $( "#historyItem-" + data_id ).fadeOut( "fast", function() {
+                            $( "#historyItemContainer-" + data_id ).remove();
+                            if ( $( "div.historyItemContainer" ).length < 1 ) {
+                                $( "#emptyHistoryMessage" ).show();
+                            }
+                        });
+                        %endif
+                    }
+                });
                 return false;
             });
-            // Delete link
-            $(this).find( "div.historyItemButtons > .delete" ).each( function() {
-                var data_id = this.id.split( "-" )[1];
-                $(this).click( function() {
-                    $( '#historyItem-' + data_id + "> div.historyItemTitleBar" ).addClass( "spinner" );
-                    $.ajax({
-                        url: "${h.url_for( action='delete_async', id='XXX' )}".replace( 'XXX', data_id ),
-                        error: function() { alert( "Delete failed" ) },
-                        success: function() {
-                            %if show_deleted:
-                                var to_update = {};
-                                to_update[data_id] = "none";
-                                updater( to_update );
-                            %else:
-                                $( "#historyItem-" + data_id ).fadeOut( "fast", function() {
-                                $( "#historyItemContainer-" + data_id ).remove();
-                                if ( $( "div.historyItemContainer" ).length < 1 ) {
-                                    $( "#emptyHistoryMessage" ).show();
-                                }
-                                });
-                            %endif
-                        }
-                    });
-                    return false;
+        });
+        // Undelete link
+        $(this).find( "a.historyItemUndelete" ).each( function() {
+            var data_id = this.id.split( "-" )[1];
+            $(this).click( function() {
+                $( '#historyItem-' + data_id + " > div.historyItemTitleBar" ).addClass( "spinner" );
+                $.ajax({
+                    url: "${h.url_for( controller='dataset', action='undelete_async', id='XXX' )}".replace( 'XXX', data_id ),
+                    error: function() { alert( "Undelete failed" ) },
+                    success: function() {
+                        var to_update = {};
+                        to_update[data_id] = "none";
+                        updater( to_update );
+                    }
                 });
-            });
-            // Undelete link
-            $(this).find( "a.historyItemUndelete" ).each( function() {
-                var data_id = this.id.split( "-" )[1];
-                $(this).click( function() {
-                    $( '#historyItem-' + data_id + " > div.historyItemTitleBar" ).addClass( "spinner" );
-                    $.ajax({
-                        url: "${h.url_for( controller='dataset', action='undelete_async', id='XXX' )}".replace( 'XXX', data_id ),
-                        error: function() { alert( "Undelete failed" ) },
-                        success: function() {
-                            var to_update = {};
-                            to_update[data_id] = "none";
-                            updater( to_update );
-                        }
-                    });
-                    return false;
-                });
+                return false;
             });
         });
-    };
-    // Looks for changes in dataset state using an async request. Keeps
-    // calling itself (via setTimeout) until all datasets are in a terminal
-    // state.
-    var updater = function ( tracked_datasets ) {
-        // Check if there are any items left to track
-        var empty = true;
-        for ( i in tracked_datasets ) {
-            empty = false;
-            break;
+    });
+};
+// Looks for changes in dataset state using an async request. Keeps
+// calling itself (via setTimeout) until all datasets are in a terminal
+// state.
+var updater = function ( tracked_datasets ) {
+    // Check if there are any items left to track
+    var empty = true;
+    for ( i in tracked_datasets ) {
+        empty = false;
+        break;
+    }
+    if ( ! empty ) {
+        // console.log( "Updater running in 3 seconds" );
+        setTimeout( function() { updater_callback( tracked_datasets ) }, 3000 );
+    } else {
+        // console.log( "Updater finished" );
+    }
+};
+var updater_callback = function ( tracked_datasets ) {
+    // Build request data
+    var ids = []
+    var states = []
+    var force_history_refresh = false
+    $.each( tracked_datasets, function ( id, state ) {
+        ids.push( id );
+        states.push( state );
+    });
+    // Make ajax call
+    $.ajax( {
+        type: "POST",
+        url: "${h.url_for( controller='root', action='history_item_updates' )}",
+        dataType: "json",
+        data: { ids: ids.join( "," ), states: states.join( "," ) },
+        success : function ( data ) {
+            $.each( data, function( id, val ) {
+                // Replace HTML
+                var container = $("#historyItemContainer-" + id);
+                container.html( val.html );
+                setupHistoryItem( container.children( ".historyItemWrapper" ) );
+                initShowHide();
+                // If new state was terminal, stop tracking
+                if (( val.state == "ok") || ( val.state == "error") || ( val.state == "empty") || ( val.state == "deleted" ) || ( val.state == "discarded" )) {
+                    if ( val.force_history_refresh ){
+                        force_history_refresh = true;
+                    }
+                    delete tracked_datasets[ parseInt(id) ];
+                } else {
+                    tracked_datasets[ parseInt(id) ] = val.state;
+                }
+            });
+            if ( force_history_refresh ) {
+                parent.frames.galaxy_history.location.reload();
+            }
+            else {
+                // Keep going (if there are still any items to track)
+                updater( tracked_datasets ); 
+            }
+        },
+        error: function() {
+            // Just retry, like the old method, should try to be smarter
+            updater( tracked_datasets );
         }
-        if ( ! empty ) {
-            // console.log( "Updater running in 3 seconds" );
-            setTimeout( function() { updater_callback( tracked_datasets ) }, 3000 );
-        } else {
-            // console.log( "Updater finished" );
-        }
-    };
-    var updater_callback = function ( tracked_datasets ) {
-        // Build request data
-        var ids = []
-        var states = []
-        var force_history_refresh = false
-        $.each( tracked_datasets, function ( id, state ) {
-            ids.push( id );
-            states.push( state );
-        });
-        // Make ajax call
-        $.ajax( {
-            type: "POST",
-            url: "${h.url_for( controller='root', action='history_item_updates' )}",
-            dataType: "json",
-            data: { ids: ids.join( "," ), states: states.join( "," ) },
-            success : function ( data ) {
-                $.each( data, function( id, val ) {
-                    // Replace HTML
-                    var container = $("#historyItemContainer-" + id);
-                    container.html( val.html );
-                    setupHistoryItem( container.children( ".historyItemWrapper" ) );
-                    initShowHide();
-                    // If new state was terminal, stop tracking
-                    if (( val.state == "ok") || ( val.state == "error") || ( val.state == "empty") || ( val.state == "deleted" ) || ( val.state == "discarded" )) {
-                        if ( val.force_history_refresh ){
-                            force_history_refresh = true;
-                        }
-                        delete tracked_datasets[ parseInt(id) ];
-                    } else {
-                        tracked_datasets[ parseInt(id) ] = val.state;
-                    }
-                });
-                if ( force_history_refresh ) {
-                    parent.frames.galaxy_history.location.reload();
-                }
-                else {
-                    // Keep going (if there are still any items to track)
-                    updater( tracked_datasets ); 
-                }
-            },
-            error: function() {
-                // Just retry, like the old method, should try to be smarter
-                updater( tracked_datasets );
-            }
-        });
-    };
+    });
+};
 </script>
 
 <style>
diff -r 7df41ad788de -r 55c0eb35fad7 templates/workflow/editor.mako
--- a/templates/workflow/editor.mako	Tue Aug 11 15:46:23 2009 -0400
+++ b/templates/workflow/editor.mako	Thu Aug 13 13:16:58 2009 -0400
@@ -31,9 +31,7 @@
     <script type='text/javascript' src="${h.url_for('/static/scripts/jquery.event.hover.js')}"> </script>
     <script type='text/javascript' src="${h.url_for('/static/scripts/jquery.form.js')}"> </script>
     <script type='text/javascript' src="${h.url_for('/static/scripts/jquery.json.js')}"> </script>
-    <script type='text/javascript' src="${h.url_for('/static/scripts/jquery.cookie.js')}"> </script>
-    <script type='text/javascript' src="${h.url_for('/static/scripts/json2.js')}"> </script>
-    <script type='text/javascript' src="${h.url_for('/static/scripts/json_cookie.js')}"> </script>
+    <script type='text/javascript' src="${h.url_for('/static/scripts/jquery.jstore-all.js')}"> </script>
 
     <script type='text/javascript' src="${h.url_for('/static/scripts/galaxy.base.js')}"> </script>
     <script type='text/javascript' src="${h.url_for('/static/scripts/galaxy.workflow_editor.canvas.js')}"> </script>
@@ -50,6 +48,7 @@
     canvas_manager = null;
     // jQuery onReady
     $( function() {
+        
         if ( window.lt_ie_7 ) {
             show_modal(
                 "Browser not supported",
@@ -57,11 +56,13 @@
             );
             return;
         }
+        
+        // Load jStore for local storage
+        $.extend(jQuery.jStore.defaults, { project: 'galaxy', flash: '/static/jStore.Flash.html' })
+        $.jStore.load(); // Auto-select best storage
+        
         // Canvas overview management
         canvas_manager = new CanvasManager( $("#canvas-viewport"), $("#overview") );
-        
-        // Preferences cookie stored as JSON so that only one cookie is needed for multiple settings
-        var prefs_cookie = new JSONCookie("galaxy.workflow");
         
         // Initialize workflow state
         reset();
@@ -128,39 +129,43 @@
             canvas_manager.draw_overview();
         });
         
-        // Stores the size of the overview in a cookie when it's resized
+        $.jStore.ready(function(engine) {
+            engine.ready(function() {
+                // On load, set the size to the pref stored in local storage if it exists
+                overview_size = $.jStore.store("overview-size");
+                if (overview_size) {
+                    $("#overview-border").css( {
+                        width: overview_size,
+                        height: overview_size
+                    });
+                }
+                
+                // Show viewport on load unless pref says it's off
+                $.jStore.store("overview-off") ? hide_overview() : show_overview()
+            });
+        });
+        
+        // Stores the size of the overview into local storage when it's resized
         $("#overview-border").bind( "dragend", function( e ) {
             var op = $(this).offsetParent();
             var opo = op.offset();
             var new_size = Math.max( op.width() - ( e.offsetX - opo.left ),
                                      op.height() - ( e.offsetY - opo.top ) );
-            prefs_cookie.set("overview-size", new_size);
+            $.jStore.store("overview-size", new_size + "px");
         });
         
-        // On load, set the size to the pref stored in cookie if it exists
-        overview_size = prefs_cookie.get("overview-size");
-        if (overview_size) {
-            $("#overview-border").css( {
-                width: overview_size,
-                height: overview_size
-            });
-        }
-        
         function show_overview() {
-            prefs_cookie.unset("overview-off");
+            $.jStore.remove("overview-off");
             $("#overview-border").css("right", "0px");
             $("#close-viewport").css("background-position", "0px 0px");
         }
         
         function hide_overview() {
-            prefs_cookie.set("overview-off", true);
+            $.jStore.store("overview-off", true);
             $("#overview-border").css("right", "20000px");
             $("#close-viewport").css("background-position", "12px 0px");
         }
         
-        // Show viewport on load unless pref says it's off
-        prefs_cookie.get("overview-off") == true ? hide_overview() : show_overview() 
-                
         // Lets the overview be toggled visible and invisible, adjusting the arrows accordingly
         $("#close-viewport").click( function() {
             $("#overview-border").css("right") == "0px" ? hide_overview() : show_overview();

    

Greg Von Kuster

tags

participants (1)