X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=jquery%2Fjquery.js;h=dad8e6d27c2da2f59b010b4944685630f0ddacdd;hb=e2c2a9392e14f4190148b3c8014fdccf66785b88;hp=b8a8b4a3379d0f2e671d9b07fb9025f009950f2d;hpb=193866de0aabe1a86d9cd2c4ff147f5dda626872;p=jquery.git

diff --git a/jquery/jquery.js b/jquery/jquery.js
index b8a8b4a..dad8e6d 100644
--- a/jquery/jquery.js
+++ b/jquery/jquery.js
@@ -1,757 +1,931 @@
 /*
- * jQuery (http://jquery.com/)
- * By John Resig (http://ejohn.org/)
- * Under an Attribution, Share Alike License
+ * jQuery - New Wave Javascript
+ *
+ * Copyright (c) 2006 John Resig (jquery.com)
+ * Licensed under the MIT License:
+ *   http://www.opensource.org/licenses/mit-license.php
  *
  * $Date$
  * $Rev$
  */
 
-function $(a,c) {
-	var $a = a || $.context || document;
-	var $c = c && c.$jquery && c.get(0) || c;
-	
-	// Since we're using Prototype's $ function,
-	// be nice and have backwards compatability
-	if ( typeof Prototype != "undefined" ) {
-		if ( $a.constructor == String ) {
-			var re = new RegExp( "[^a-zA-Z0-9_-]" );
-			if ( !re.test($a) ) {
-				$c = $c && $c.documentElement || document;
-				if ( $c.getElementsByTagName($a).length == 0 ) {
-					var obj = $c.getElementById($a);
-					if ( obj != null ) return obj;
-				}
-			}
-		} else if ( $a.constructor == Array ) {
-			return $.map( $a, function(b){
-				if ( b.constructor == String )
-					return document.getElementById(b);
-				return b;
-			});
-		}
-	}
+// Global undefined variable
+window.undefined = window.undefined;
 
-	// Load Dynamic Function List
-	var self = {
-		cur: $.Select($a,$c),
-		$jquery: "$Rev$",
-		
-		// The only two getters
-		size: function() {return this.get().length},
-		get: function(i) {
-			return i == null ? this.cur : this.cur[i];
-		},
-		
-		each: function(f) {
-			for ( var i = 0; i < this.size(); i++ )
-				$.apply( this.get(i), f, [i] );
-			return this;
-		},
-		set: function(a,b) {
-			return this.each(function(){
-				if ( b == null )
-					for ( var j in a )
-						$.attr(this,j,a[j]);
-				else
-					$.attr(this,a,b);
-			});
-		},
-		html: function(h) {
-			return h == null && this.size() ?
-        this.get(0).innerHTML : this.set( "innerHTML", h );
-		},
-		val: function(h) {
-			return h == null && this.size() ?
-        this.get(0).value : this.set( "value", h );
-		},
-		
-		css: function(a,b) {
-			return this.each(function(){
-				if ( !b )
+/**
+ * Create a new jQuery Object
+ * @constructor
+ */
+function jQuery(a,c) {
+
+	// Shortcut for document ready (because $(document).each() is silly)
+	if ( a && a.constructor == Function )
+		return $(document).ready(a);
+
+	// Make sure t hat a selection was provided
+	a = a || jQuery.context || document;
+
+	/*
+ 	 * Handle support for overriding other $() functions. Way too many libraries
+ 	 * provide this function to simply ignore it and overwrite it.
+ 	 */
+
+	// Check to see if this is a possible collision case
+	if ( jQuery._$ && !c && a.constructor == String && 
+      
+		// Make sure that the expression is a colliding one
+		!/[^a-zA-Z0-9_-]/.test(a) &&
+        
+		// and that there are no elements that match it
+		// (this is the one truly ambiguous case)
+		!document.getElementsByTagName(a).length )
+
+			// Use the default method, in case it works some voodoo
+			return jQuery._$( a );
+
+	// Watch for when a jQuery object is passed as the selector
+	if ( a.jquery )
+		return a;
+
+	// Watch for when a jQuery object is passed at the context
+	if ( c && c.jquery )
+		return $(c.get()).find(a);
+	
+	// If the context is global, return a new object
+	if ( window == this )
+		return new jQuery(a,c);
+
+	// Watch for when an array is passed in
+	this.get( a.constructor == Array ?
+		// Assume that it's an array of DOM Elements
+		a :
+
+		// Find the matching elements and save them for later
+		jQuery.Select( a, c ) );
+
+	var fn = arguments[ arguments.length - 1 ];
+	if ( fn && fn.constructor == Function )
+		this.each(fn);
+}
+
+// Map over the $ in case of overwrite
+if ( $ )
+	jQuery._$ = $;
+
+// Map the jQuery namespace to the '$' one
+var $ = jQuery;
+
+jQuery.fn = jQuery.prototype = {
+	/**
+	 * The current SVN version of jQuery.
+	 *
+	 * @private
+	 * @type String
+	 */
+	jquery: "$Rev$",
+	
+	/**
+	 * The number of elements currently matched.
+	 *
+	 * @type Number
+	 */
+	size: function() {
+		return this.length;
+	},
+	
+	/**
+	 * Access the elements matched. If a number is provided,
+	 * the Nth element is returned, otherwise, an array of all
+	 * matched items is returned.
+	 *
+	 * @type Array,DOMElement
+	 */
+	get: function(num) {
+		if ( num && num.constructor == Array ) {
+			this.length = 0;
+			[].push.apply( this, num );
+		} else
+			return num == undefined ?
+
+				// Return a 'clean' array
+				$.map( this, function(a){ return a } ) :
+
+				// Return just the object
+				this[num];
+	},
+	
+	each: function(f) {
+		for ( var i = 0; i < this.size(); i++ )
+			f.apply( this[i], [i] );
+		return this;
+	},
+	set: function(a,b) {
+		return this.each(function(){
+			if ( b === undefined )
+				for ( var j in a )
+					jQuery.attr(this,j,a[j]);
+			else
+				jQuery.attr(this,a,b);
+		});
+	},
+	html: function(h) {
+		return h == undefined && this.size() ?
+			this[0].innerHTML : this.set( "innerHTML", h );
+	},
+	val: function(h) {
+		return h == undefined && this.size() ?
+			this[0].value : this.set( "value", h );
+	},
+	text: function(e) {
+		e = e || this;
+		var t = "";
+		for ( var j = 0; j < e.length; j++ ) {
+			var r = e[j].childNodes;
+			for ( var i = 0; i < r.length; i++ )
+				t += r[i].nodeType != 1 ?
+					r[i].nodeValue : jQuery.fn.text([ r[i] ]);
+		}
+		return t;
+	},
+	
+	css: function(a,b) {
+		return a.constructor != String || b ?
+			this.each(function(){
+				if ( b === undefined )
 					for ( var j in a )
-						$.attr(this.style,j,a[j]);
-				else
-					$.attr(this.style,a,b);
-			});
-		},
-		toggle: function() {
-			return this.each(function(){
-				var d = $.getCSS(this,"display");
-				if ( d == "none" || d == '' )
-					$(this).show();
+						jQuery.attr(this.style,j,a[j]);
 				else
-					$(this).hide();
-			});
-		},
-		show: function(a) {
-			return this.each(function(){
-				this.style.display = this.$$oldblock ? this.$$oldblock : '';
-				if ( $.getCSS(this,"display") == "none" ) this.style.display = 'block';
-			});
-		},
-		hide: function(a) {
-			return this.each(function(){
-				this.$$oldblock = $.getCSS(this,"display");
-				if ( this.$$oldblock == "none" ) this.$$oldblock = 'block';
-				this.style.display = 'none';
-			});
-		},
-		addClass: function(c) {
-			return this.each(function(){
-				if ($.hasWord(this,c)) return;
-				this.className += ( this.className.length > 0 ? " " : "" ) + c;
-			});
-		},
-		removeClass: function(c) {
-			return this.each(function(){
-				this.className = c == null ? '' :
-					this.className.replace(
-						new RegExp('(^|\\s*\\b[^-])'+c+'($|\\b(?=[^-]))', 'g'), '');
-			});
-		},
-		// TODO: Optomize
-		toggleClass: function(c) {
-			return this.each(function(){
-				if ($.hasWord(this,c))
-					this.className = 
-						this.className.replace(
-							new RegExp('(\\s*\\b[^-])'+c+'($|\\b(?=[^-]))', 'g'), '');
-				else
-					this.className += ( this.className.length > 0 ? " " : "" ) + c;
-			});
-		},
-		remove: function() {
-			this.each(function(){this.parentNode.removeChild( this );});
-			this.cur = [];
-			return this;
-		},
-		
-		wrap: function() {
-			var a = $.clean(arguments);
-			return this.each(function(){
-				var b = a[0].cloneNode(true);
-				this.parentNode.insertBefore( b, this );
-				while ( b.firstChild ) b = b.firstChild;
-				b.appendChild( this );
-			});
-		},
-		
-		append: function() {
-      var clone = this.size() > 1;
-			var a = $.clean(arguments);
-			return this.each(function(){
-				for ( var i in a )
-				  this.appendChild( clone ? a[i].cloneNode(true) : a[i] );
-			});
-		},
-
-		appendTo: function() {
-			var a = arguments;
-			return this.each(function(){
-				for ( var i = 0; i < a.length; i++ )
-					$(a[i]).append( this );
-			});
-		},
-		
-		prepend: function() {
-      var clone = this.size() > 1;
-			var a = $.clean(arguments);
-			return this.each(function(){
-				for ( var i = a.length - 1; i >= 0; i-- )
-					this.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.firstChild );
-			});
-		},
-		
-		before: function() {
-      var clone = this.size() > 1;
-			var a = $.clean(arguments);
-			return this.each(function(){
-				for ( var i in a )
-					this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this );
-			});
-		},
-		
-		after: function() {
-      var clone = this.size() > 1;
-			var a = $.clean(arguments);
-			return this.each(function(){
-				for ( var i = a.length - 1; i >= 0; i-- )
-					this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.nextSibling );
-			});
-		},
-
-		empty: function() {
-			return this.each(function(){
-				while ( this.firstChild )
-					this.removeChild( this.firstChild );
-			});
-		},
-		
-		bind: function(t,f) {
-			return this.each(function(){addEvent(this,t,f);});
-		},
-		unbind: function(t,f) {
-			return this.each(function(){removeEvent(this,t,f);});
-		},
-		trigger: function(t) {
-			return this.each(function(){triggerEvent(this,t);});
-		},
-		
-		find: function(t) {
-			var old = [], ret = [];
-			this.each(function(){
-				old[old.length] = this;
-				ret = $.merge( ret, $.Select(t,this) );
-			});
-			this.old = old;
-			this.cur = ret;
-			return this;
-		},
-		end: function() {
-			this.cur = this.old;
-			return this;
-		},
-
-    parent: function(a) {
-      this.cur = $.map(this.cur,function(d){
-        return d.parentNode;
-      });
-      if ( a ) this.cur = $.filter(a,this.cur).r;
-      return this;
-    },
-
-    parents: function(a) {
-      this.cur = $.map(this.cur,$.parents);
-      if ( a ) this.cur = $.filter(a,this.cur).r;
-      return this;
-    },
-
-    siblings: function(a) {
-      // Incorrect, need to exclude current element
-      this.cur = $.map(this.cur,$.sibling);
-      if ( a ) this.cur = $.filter(a,this.cur).r;
-      return this;
-    },
-		
-		parents: function(a) {
-			return this;
-		},
-		
-		filter: function(t) {
-			this.cur = $.filter(t,this.cur).r;
-			return this;
-		},
-		not: function(t) {
-			this.cur = t.constructor == String ?
-				$.filter(t,this.cur,false).r :
-				$.grep(this.cur,function(a){return a != t;});
-			return this;
-		},
-		add: function(t) {
-			this.cur = $.merge( this.cur, t.constructor == String ?
-				$.Select(t) : t.constructor == Array ? t : [t] );
-			return this;
-		},
-		is: function(t) {
-			return $.filter(t,this.cur).r.length > 0;
-		},
-		isNot: function(t) {
-			return !this.s(t);
+					jQuery.attr(this.style,a,b);
+			}) : jQuery.css( this[0], a );
+	},
+	toggle: function() {
+		return this.each(function(){
+			var d = jQuery.css(this,"display");
+			if ( !d || d == "none" )
+				$(this).show();
+			else
+				$(this).hide();
+		});
+	},
+	show: function() {
+		return this.each(function(){
+			this.style.display = this.oldblock ? this.oldblock : "";
+			if ( jQuery.css(this,"display") == "none" )
+				this.style.display = "block";
+		});
+	},
+	hide: function() {
+		return this.each(function(){
+			this.oldblock = jQuery.css(this,"display");
+			if ( this.oldblock == "none" )
+				this.oldblock = "block";
+			this.style.display = "none";
+		});
+	},
+	addClass: function(c) {
+		return this.each(function(){
+			jQuery.className.add(this,c);
+		});
+	},
+	removeClass: function(c) {
+		return this.each(function(){
+			jQuery.className.remove(this,c);
+		});
+	},
+
+	toggleClass: function(c) {
+		return this.each(function(){
+			if (jQuery.hasWord(this,c))
+				jQuery.className.remove(this,c);
+			else
+				jQuery.className.add(this,c);
+		});
+	},
+	remove: function() {
+		return this.each(function(){
+			this.parentNode.removeChild( this );
+		});
+	},
+	
+	wrap: function() {
+		var a = jQuery.clean(arguments);
+		return this.each(function(){
+			var b = a[0].cloneNode(true);
+			this.parentNode.insertBefore( b, this );
+			while ( b.firstChild )
+				b = b.firstChild;
+			b.appendChild( this );
+		});
+	},
+	
+	append: function() {
+		var clone = this.size() > 1;
+		var a = jQuery.clean(arguments);
+		return this.domManip(function(){
+			for ( var i = 0; i < a.length; i++ )
+				this.appendChild( clone ? a[i].cloneNode(true) : a[i] );
+		});
+	},
+	
+	appendTo: function() {
+		var a = arguments;
+		return this.each(function(){
+			for ( var i = 0; i < a.length; i++ )
+				$(a[i]).append( this );
+		});
+	},
+	
+	prepend: function() {
+		var clone = this.size() > 1;
+		var a = jQuery.clean(arguments);
+		return this.domManip(function(){
+			for ( var i = a.length - 1; i >= 0; i-- )
+				this.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.firstChild );
+		});
+	},
+	
+	before: function() {
+		var clone = this.size() > 1;
+		var a = jQuery.clean(arguments);
+		return this.each(function(){
+			for ( var i = 0; i < a.length; i++ )
+				this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this );
+		});
+	},
+	
+	after: function() {
+		var clone = this.size() > 1;
+		var a = jQuery.clean(arguments);
+		return this.each(function(){
+			for ( var i = a.length - 1; i >= 0; i-- )
+				this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this.nextSibling );
+		});
+	},
+	
+	empty: function() {
+		return this.each(function(){
+			while ( this.firstChild )
+				this.removeChild( this.firstChild );
+		});
+	},
+	
+	bind: function(t,f) {
+		return this.each(function(){jQuery.event.add(this,t,f);});
+	},
+	unbind: function(t,f) {
+		return this.each(function(){jQuery.event.remove(this,t,f);});
+	},
+	trigger: function(t) {
+		return this.each(function(){jQuery.event.trigger(this,t);});
+	},
+	
+	pushStack: function(a,args) {
+		var fn = args[args.length-1];
+
+		if ( !fn || fn.constructor != Function ) {
+			if ( !this.stack ) this.stack = [];
+			this.stack.push( this.get() );
+			this.get( a );
+		} else {
+			var old = this.get();
+			this.get( a );
+			if ( fn.constructor == Function )
+				return this.each( fn );
+			this.get( old );
 		}
-	};
+
+		return this;
+	},
+
+	end: function() {
+		this.get( this.stack.pop() );
+		return this;
+	},
 	
-	// TODO: Remove need to return this
-	for ( var i in $.fn ) {
-		if ( self[i] != null )
-			self["_"+i] = self[i];
-		self[i] = $.fn[i];
-	}
+	find: function(t) {
+		return this.pushStack( $.map( this, function(a){
+			return jQuery.Select(t,a);
+		}), arguments );
+	},
 	
-	if ( typeof Prototype != "undefined" && $a.constructor != String ) {
-		if ( $c ) $a = self.get();
-		for ( var i in self ) {(function(j){
-			try {
-				if ( $a[j] == null ) {
-					$a[j] = function() {
-						return $.apply(self,self[j],arguments);
-					};
-				}
-			} catch(e) {}
-		})(i);}
-		return $a;
-	}
+	parent: function(a) {
+		var ret = jQuery.map(this,"a.parentNode");
+		if ( a ) ret = jQuery.filter(a,ret).r;
+		return this.pushStack( ret, arguments );
+	},
 	
-	return self;
-}
+	parents: function(a) {
+		var ret = jQuery.map(this,jQuery.parents);
+		if ( a ) ret = jQuery.filter(a,ret).r;
+		return this.pushStack( ret, arguments );
+	},
+	
+	siblings: function(a) {
+		// Incorrect, need to exclude current element
+		var ret = jQuery.map(this,jQuery.sibling);
+		if ( a ) ret = jQuery.filter(a,ret).r;
+		return this.pushStack( ret, arguments );
+	},
+	
+	filter: function(t) {
+		if ( /,/.test(t) ) {
+			var p = t.split(/\s*,\s*/);
+			return this.pushStack( $.map(this,function(a){
+				for ( var i = 0; i < p.length; i++ )
+					if ( jQuery.filter(p[i],[a]).r.length )
+						return a;
+			}), arguments );
+		} else
+			return this.pushStack( jQuery.filter(t,this).r, arguments );
+	},
+	not: function(t) {
+		return this.pushStack( t.constructor == String ?
+			jQuery.filter(t,this,false).r :
+			jQuery.grep(this,function(a){ return a != t; }), arguments );
+	},
+	add: function(t) {
+		return this.pushStack( jQuery.merge( this, t.constructor == String ?
+			jQuery.Select(t) : t.constructor == Array ? t : [t] ), arguments );
+	},
+	
+	/**
+	 * A wrapper function for each() to be used by append and prepend.
+	 * Handles cases where you're trying to modify the inner contents of
+	 * a table, when you actually need to work with the tbody.
+	 *
+	 * @member jQuery
+	 * @param {String} expr The expression with which to filter
+	 * @type Boolean
+	 */
+	is: function(expr) {
+		return jQuery.filter(expr,this).r.length > 0;
+	},
+	
+	/**
+	 * A wrapper function for each() to be used by append and prepend.
+	 * Handles cases where you're trying to modify the inner contents of
+	 * a table, when you actually need to work with the tbody.
+	 *
+	 * @private
+	 * @member jQuery
+	 * @param {Function} fn The function doing the DOM manipulation.
+	 * @type jQuery
+	 */
+	domManip: function(fn){
+		return this.each(function(){
+			var obj = this;
+			
+			if ( this.nodeName == "TABLE" ) {
+				var tbody = this.getElementsByTagName("tbody");
+
+				if ( !tbody.length ) {
+					obj = document.createElement("tbody");
+					this.appendChild( obj );
+				} else
+					obj = tbody[0];
+			}
+	
+			fn.apply( obj );
+		});
+	}
+};
 
-$.apply = function(o,f,a) {
-	a = a || [];
-	if ( f.apply )
-		return f.apply( o, a );
-  else {
-		var p = [];
-		for (var i = 0; i < a.length; i++)
-			p[i] = 'a['+i+']';
-		o.$$exec = this;
-		var r = eval('o.$$exec(' + p.join(',') + ')');
-		o.$$exec = null;
-		return r;
+/**
+ * Similar to the Prototype $A() function, only it allows you to
+ * forcefully pass array-like structures into $().
+ */
+jQuery.A = function(a){
+	// Create a temporary, clean, array
+        var r = [];
+
+	// and copy the old array contents over to it
+        for ( var i = 0; i < a.length; i++ )
+                r.push( a[i] );
+
+	// Return the sane jQuery object
+        return $(r);
+};
+
+jQuery.className = {
+	add: function(o,c){
+		if (jQuery.hasWord(o,c)) return;
+		o.className += ( o.className ? " " : "" ) + c;
+	},
+	remove: function(o,c){
+		o.className = !c ? "" :
+			o.className.replace(
+				new RegExp("(^|\\s*\\b[^-])"+c+"($|\\b(?=[^-]))", "g"), "");
+	}
+};
+
+(function(){
+	var b = navigator.userAgent.toLowerCase();
+
+	// Figure out what browser is being used
+	jQuery.browser =
+		( /webkit/.test(b) && "safari" ) ||
+		( /opera/.test(b) && "opera" ) ||
+		( /msie/.test(b) && "msie" ) ||
+		( !/compatible/.test(b) && "mozilla" ) ||
+		"other";
+
+	// Check to see if the W3C box model is being used
+	jQuery.boxModel = ( jQuery.browser != "msie" || document.compatMode == "CSS1Compat" );
+})();
+
+$.swap = function(e,o,f) {
+	for ( var i in o ) {
+		e.style["old"+i] = e.style[i];
+		e.style[i] = o[i];
 	}
+	f.apply( e, [] );
+	for ( var i in o )
+		e.style[i] = e.style["old"+i];
 };
 
-$.getCSS = function(e,p) {
+jQuery.css = function(e,p) {
 	// Adapted from Prototype 1.4.0
-	if ( p == 'height' || p == 'width' ) {
-    if ($.getCSS(e,"display") != 'none')
-			return p == 'height' ?
-				e.offsetHeight || parseInt(e.style.height) : 
-				e.offsetWidth || parseInt(e.style.width);
-    var els = e.style;
-    var ov = els.visibility;
-    var op = els.position;
-		var od = els.display;
-    els.visibility = 'hidden';
-    els.position = 'absolute';
-    els.display = '';
-		var oHeight = e.clientHeight || parseInt(e.style.height);
-    var oWidth = e.clientWidth || parseInt(e.style.width);
-    els.display = od;
-    els.position = op;
-    els.visibility = ov;
-		return p == 'height' ? oHeight : oWidth;
-  }
-	
-  if (e.style[p])
-    return e.style[p];
-  else if (e.currentStyle)
-    return e.currentStyle[p];
-  else if (document.defaultView && document.defaultView.getComputedStyle) {
-    p = p.replace(/([A-Z])/g,"-$1");
-    p = p.toLowerCase();
-    var s = document.defaultView.getComputedStyle(e,"");
-    var r = s ? s.getPropertyValue(p) : p;
-		return r;
-  } else
-    return null;
+	if ( p == "height" || p == "width" ) {
+		var old = {}, oHeight, oWidth, d = ["Top","Bottom","Right","Left"];
+
+		for ( var i in d ) {
+			old["padding" + d[i]] = 0;
+			old["border" + d[i] + "Width"] = 0;
+		}
+
+		$.swap( e, old, function() {
+			if (jQuery.css(e,"display") != 'none') {
+				oHeight = e.offsetHeight;
+				oWidth = e.offsetWidth;
+			} else
+				$.swap( e, { visibility: 'hidden', position: 'absolute', display: '' },
+					function(){
+						oHeight = e.clientHeight;
+						oWidth = e.clientWidth;
+					});
+		});
+
+		return p == "height" ? oHeight : oWidth;
+	}
+	
+	var r;
+
+	if (e.style[p])
+		r = e.style[p];
+ 	else if (e.currentStyle)
+		r = e.currentStyle[p];
+	else if (document.defaultView && document.defaultView.getComputedStyle) {
+		p = p.replace(/([A-Z])/g,"-$1").toLowerCase();
+		var s = document.defaultView.getComputedStyle(e,"");
+		r = s ? s.getPropertyValue(p) : null;
+ 	}
+	
+	return r;
 };
-$.css = $.getCSS;
 
-$.clean = function(a) {
+jQuery.clean = function(a) {
 	var r = [];
-	for ( var i = 0; i < a.length; i++ )
+	for ( var i = 0; i < a.length; i++ ) {
 		if ( a[i].constructor == String ) {
+
+			if ( !a[i].indexOf("<tr") ) {
+				var tr = true;
+				a[i] = "<table>" + a[i] + "</table>";
+			} else if ( !a[i].indexOf("<td") || !a[i].indexOf("<th") ) {
+				var td = true;
+				a[i] = "<table><tbody><tr>" + a[i] + "</tr></tbody></table>";
+			}
+
 			var div = document.createElement("div");
 			div.innerHTML = a[i];
+
+			if ( tr || td ) {
+				div = div.firstChild.firstChild;
+				if ( td ) div = div.firstChild;
+			}
+
 			for ( var j = 0; j < div.childNodes.length; j++ )
 				r[r.length] = div.childNodes[j];
-		} else if ( a[i].length )
-			for ( var j = 0; j < a[i].length; j++ )
-				r[r.length] = a[i][j];
-		else if ( a[i] != null )
-			r[r.length] = 
+		} else if ( a[i].length && !a[i].nodeType )
+			for ( var k = 0; k < a[i].length; k++ )
+				r[r.length] = a[i][k];
+		else if ( a[i] !== null )
+			r[r.length] =
 				a[i].nodeType ? a[i] : document.createTextNode(a[i].toString());
+	}
 	return r;
 };
 
-$.g = {
-	'': "m[2] == '*' || a.nodeName.toUpperCase() == m[2].toUpperCase()",
-	'#': "a.id == m[2]",
-	':': {
-		lt: "i < m[3]-0",
-		gt: "i > m[3]-0",
-		nth: "m[3] - 0 == i",
-		eq: "m[3] - 0 == i",
-		first: "i == 0",
-		last: "i == r.length - 1",
-		even: "i % 2 == 0",
-		odd: "i % 2 == 1",
-		"first-child": "$.sibling(a,0).cur",
-		"nth-child": "(m[3] == 'even'?$.sibling(a,m[3]).n % 2 == 0 :(m[3] == 'odd'?$.sibling(a,m[3]).n % 2 == 1:$.sibling(a,m[3]).cur))",
-		"last-child": "$.sibling(a,0,true).cur",
-		"nth-last-child": "$.sibling(a,m[3],true).cur",
-		"first-of-type": "$.ofType(a,0)",
-		"nth-of-type": "$.ofType(a,m[3])",
-		"last-of-type": "$.ofType(a,0,true)",
-		"nth-last-of-type": "$.ofType(a,m[3],true)",
-		"only-of-type": "$.ofType(a) == 1",
-		"only-child": "$.sibling(a).length == 1",
-		parent: "a.childNodes.length > 0",
-		empty: "a.childNodes.length == 0",
-		root: "a == ( a.ownerDocument ? a.ownerDocument : document ).documentElement",
-		contains: "(a.innerText || a.innerHTML).indexOf(m[3]) != -1",
-		visible: "(!a.type || a.type != 'hidden') && ($.getCSS(a,'display') != 'none' && $.getCSS(a,'visibility') != 'hidden')",
-		hidden: "(a.type && a.type == 'hidden') || $.getCSS(a,'display') == 'none' || $.getCSS(a,'visibility') == 'hidden'",
-		enabled: "a.disabled == false",
+jQuery.g = {
+	"": "m[2]== '*'||a.nodeName.toUpperCase()==m[2].toUpperCase()",
+	"#": "a.getAttribute('id')&&a.getAttribute('id')==m[2]",
+	":": {
+		lt: "i<m[3]-0",
+		gt: "i>m[3]-0",
+		nth: "m[3]-0==i",
+		eq: "m[3]-0==i",
+		first: "i==0",
+		last: "i==r.length-1",
+		even: "i%2==0",
+		odd: "i%2==1",
+		"first-child": "jQuery.sibling(a,0).cur",
+		"nth-child": "(m[3]=='even'?jQuery.sibling(a,m[3]).n%2==0:(m[3]=='odd'?jQuery.sibling(a,m[3]).n%2==1:jQuery.sibling(a,m[3]).cur))",
+		"last-child": "jQuery.sibling(a,0,true).cur",
+		"nth-last-child": "jQuery.sibling(a,m[3],true).cur",
+		"first-of-type": "jQuery.ofType(a,0)",
+		"nth-of-type": "jQuery.ofType(a,m[3])",
+		"last-of-type": "jQuery.ofType(a,0,true)",
+		"nth-last-of-type": "jQuery.ofType(a,m[3],true)",
+		"only-of-type": "jQuery.ofType(a)==1",
+		"only-child": "jQuery.sibling(a).length==1",
+		parent: "a.childNodes.length",
+		empty: "!a.childNodes.length",
+		root: "a==(a.ownerDocument||document).documentElement",
+		contains: "(a.innerText||a.innerHTML).indexOf(m[3])!=-1",
+		visible: "(!a.type||a.type!='hidden')&&(jQuery.css(a,'display')!='none'&&jQuery.css(a,'visibility')!= 'hidden')",
+		hidden: "(a.type&&a.type=='hidden')||jQuery.css(a,'display')=='none'||jQuery.css(a,'visibility')== 'hidden'",
+		enabled: "!a.disabled",
 		disabled: "a.disabled",
 		checked: "a.checked"
 	},
-	// TODO: Write getAttribute helper
-	".": "$.hasWord(a.className||a.getAttribute('class'),m[2])",
+	".": "jQuery.hasWord(a,m[2])",
 	"@": {
-		"=": "$.attr(a,m[3]) == m[4]",
-		"!=": "$.attr(a,m[3]) != m[4]",
-		"~=": "$.hasWord($.attr(a,m[3]),m[4])",
-		"|=": "$.attr(a,m[3]).indexOf(m[4]) == 0",
-		"^=": "$.attr(a,m[3]).indexOf(m[4]) == 0",
-		"$=": "$.attr(a,m[3]).substr( $.attr(a,m[3]).length - m[4].length, m[4].length ) == m[4]",
-		"*=": "$.attr(a,m[3]).indexOf(m[4]) >= 0",
-		"": "m[3] == '*' ? a.attributes.length > 0 : $.attr(a,m[3])"
-	},
-	"[": "$.Select(m[2],a).length > 0"
+		"=": "jQuery.attr(a,m[3])==m[4]",
+		"!=": "jQuery.attr(a,m[3])!=m[4]",
+		"~=": "jQuery.hasWord(jQuery.attr(a,m[3]),m[4])",
+		"|=": "!jQuery.attr(a,m[3]).indexOf(m[4])",
+		"^=": "!jQuery.attr(a,m[3]).indexOf(m[4])",
+		"$=": "jQuery.attr(a,m[3]).substr( jQuery.attr(a,m[3]).length - m[4].length,m[4].length )==m[4]",
+		"*=": "jQuery.attr(a,m[3]).indexOf(m[4])>=0",
+		"": "m[3]=='*'?a.attributes.length>0:jQuery.attr(a,m[3])"
+	},
+	"[": "jQuery.Select(m[2],a).length"
 };
 
-$.fn = {};
+jQuery.token = [
+	"\\.\\.|/\\.\\.", "a.parentNode",
+	">|/", "jQuery.sibling(a.firstChild)",
+	"\\+", "jQuery.sibling(a).next",
+	"~", function(a){
+		var r = [];
+		var s = jQuery.sibling(a);
+		if ( s.n > 0 )
+			for ( var i = s.n; i < s.length; i++ )
+				r[r.length] = s[i];
+		return r;
+	}
+];
+
+jQuery.Select = function( t, context ) {
+	// Make sure that the context is a DOM Element
+	if ( context && context.getElementsByTagName == undefined )
+		context = null;
+
+	// Set the correct context (if none is provided)
+	context = context || jQuery.context || document;
 
-$.Select = function( t, context ) {
-	context = context || $.context || document;
 	if ( t.constructor != String ) return [t];
-	
-	if ( t.indexOf("//") == 0 ) {
+
+	if ( !t.indexOf("//") ) {
 		context = context.documentElement;
 		t = t.substr(2,t.length);
-	} else if ( t.indexOf("/") == 0 ) {
+	} else if ( !t.indexOf("/") ) {
 		context = context.documentElement;
 		t = t.substr(1,t.length);
 		// FIX Assume the root element is right :(
-		if ( t.indexOf('/') )
-			t = t.substr(t.indexOf('/'),t.length);
+		if ( t.indexOf("/") >= 1 )
+			t = t.substr(t.indexOf("/"),t.length);
 	}
-	
+
 	var ret = [context];
-  var done = [];
+	var done = [];
 	var last = null;
-  
-  while ( t.length > 0 && last != t ) {
-    var r = [];
+
+	while ( t.length > 0 && last != t ) {
+		var r = [];
 		last = t;
-    
-    t = $.cleanSpaces(t);
-    
-    var re = new RegExp( "^//", "i" );
-    t = t.replace( re, "" );
-
-    if ( t.indexOf('..') == 0 || t.indexOf('/..') == 0 ) {
-			if ( t.indexOf('/') == 0 )
-				t = t.substr(1,t.length);
-      r = $.map( ret, function(a){ return a.parentNode; } );
-			t = t.substr(2,t.length);
-			t = $.cleanSpaces(t);
-    } else if ( t.indexOf('>') == 0 || t.indexOf('/') == 0 ) {
-      r = $.map( ret, function(a){ return ( a.childNodes.length > 0 ? $.sibling( a.firstChild ) : null ); } );
-			t = t.substr(1,t.length);
-			t = $.cleanSpaces(t);
-    } else if ( t.indexOf('+') == 0 ) {
-      r = $.map( ret, function(a){ return $.sibling(a).next; } );
-			t = t.substr(1,t.length);
-			t = $.cleanSpaces(t);
-    } else if ( t.indexOf('~') == 0 ) {
-      r = $.map( ret, function(a){
-        var r = [];
-        var s = $.sibling(a);
-        if ( s.n > 0 )
-          for ( var i = s.n; i < s.length; i++ )
-            r[r.length] = s[i];
-        return r;
-      } );
-			t = t.substr(1,t.length);
-			t = $.cleanSpaces(t);
-    } else if ( t.indexOf(',') == 0 || t.indexOf('|') == 0 ) {
-      if ( ret[0] == context ) ret.shift();
-      done = $.merge( done, ret );
-      r = ret = [context];
-			t = " " + t.substr(1,t.length);
-    } else {
-      var re = new RegExp( "^([#.]?)([a-z0-9\\*_-]*)", "i" );
-      var m = re.exec(t);
+
+		t = jQuery.cleanSpaces(t).replace( /^\/\//i, "" );
+		
+		var foundToken = false;
+		
+		for ( var i = 0; i < jQuery.token.length; i += 2 ) {
+			var re = new RegExp("^(" + jQuery.token[i] + ")");
+			var m = re.exec(t);
 			
-			if ( m[1] == "#" ) { // Ummm, should make this work in all XML docs
-				var oid = document.getElementById(m[2]);
-				r = oid ? [oid] : [];
-        t = t.replace( re, "" );
+			if ( m ) {
+				r = ret = jQuery.map( ret, jQuery.token[i+1] );
+				t = jQuery.cleanSpaces( t.replace( re, "" ) );
+				foundToken = true;
+			}
+		}
+		
+		if ( !foundToken ) {
+
+			if ( !t.indexOf(",") || !t.indexOf("|") ) {
+				if ( ret[0] == context ) ret.shift();
+				done = jQuery.merge( done, ret );
+				r = ret = [context];
+				t = " " + t.substr(1,t.length);
 			} else {
-			  if ( m[2] == "" || m[1] == "." ) m[2] = "*";
-
-			  for ( var i = 0; i < ret.length; i++ ) {
-				  var o = ret[i];
-				  if ( o ) {
-					  switch( m[2] ) {
-						  case '*':
-							  r = $.merge( $.getAll(o), r );
-						  break;
-						  case 'text': case 'radio': case 'checkbox': case 'hidden':
-						  case 'button': case 'submit': case 'image': case 'password':
-						  case 'reset': case 'file':
-							  r = $.merge( $.grep( $.tag(o,"input"), 
-										  function(a){ return a.type == m[2] }), r );
-						  break;
-						  case 'input':
-							  r = $.merge( $.tag(o,"input"), r );
-							  r = $.merge( $.tag(o,"select"), r );
-							  r = $.merge( $.tag(o,"textarea"), r );
-						  break;
-						  default:
-							  r = $.merge( r, $.tag(o,m[2]) );
-						  break;
-					  }
-				  }
-			  }
+				var re2 = /^([#.]?)([a-z0-9\\*_-]*)/i;
+				var m = re2.exec(t);
+	
+				if ( m[1] == "#" ) {
+					// Ummm, should make this work in all XML docs
+					var oid = document.getElementById(m[2]);
+					r = ret = oid ? [oid] : [];
+					t = t.replace( re2, "" );
+				} else {
+					if ( !m[2] || m[1] == "." ) m[2] = "*";
+	
+					for ( var i = 0; i < ret.length; i++ )
+						r = jQuery.merge( r,
+							m[2] == "*" ?
+								jQuery.getAll(ret[i]) :
+								ret[i].getElementsByTagName(m[2])
+						);
+				}
 			}
-    }
+			
+		}
+
+		if ( t ) {
+			var val = jQuery.filter(t,r);
+			ret = r = val.r;
+			t = jQuery.cleanSpaces(val.t);
+		}
+	}
 
-		var val = $.filter(t,r);
-		ret = r = val.r;
-		t = $.cleanSpaces(val.t);
-  }
+	if ( ret && ret[0] == context ) ret.shift();
+	done = jQuery.merge( done, ret );
 
-  if ( ret && ret[0] == context ) ret.shift();
-  done = $.merge( done, ret );
-  return done;
+	return done;
 };
 
-$.tag = function(a,b){
-  return a && typeof a.getElementsByTagName != "undefined" ?
-    a.getElementsByTagName( b ) : [];
+jQuery.getAll = function(o,r) {
+	r = r || [];
+	var s = o.childNodes;
+	for ( var i = 0; i < s.length; i++ )
+		if ( s[i].nodeType == 1 ) {
+			r[r.length] = s[i];
+			jQuery.getAll( s[i], r );
+		}
+	return r;
 };
 
-$.attr = function(o,a,v){
-  if ( a && a.constructor == String ) {
-    var fix = {
-      'for': 'htmlFor',
-      'text': 'cssText',
-      'class': 'className',
-      'float': 'cssFloat'
-    };
-    a = (fix[a] && fix[a].replace && fix[a]) || a;
-    var r = new RegExp("-([a-z])","ig");
-    a = a.replace(r,function(z,b){return b.toUpperCase();});
-    if ( v != null ) {
-      o[a] = v;
-      if ( o.setAttribute ) o.setAttribute(a,v);
-    } 
-    return o[a] || o.getAttribute(a) || '';
-  } else return '';
+jQuery.attr = function(o,a,v){
+	if ( a && a.constructor == String ) {
+		var fix = {
+			"for": "htmlFor",
+			"class": "className",
+			"float": "cssFloat"
+		};
+		a = (fix[a] && fix[a].replace && fix[a]) || a;
+		var r = /-([a-z])/ig;
+		a = a.replace(r,function(z,b){return b.toUpperCase();});
+		if ( v != undefined ) {
+			o[a] = v;
+			if ( o.setAttribute && a != "disabled" )
+				o.setAttribute(a,v);
+		}
+		return o[a] || o.getAttribute(a) || "";
+	} else
+		return "";
 };
 
-$.filter = function(t,r,not) {
-	var g = $.grep;
-	if ( not == false ) var g = function(a,f) {return $.grep(a,f,true);};
-	
-	while ( t.length > 0 && t.match(/^[:\\.#\\[a-zA-Z\\*]/) ) {
-		var re = new RegExp( "^\\[ *@([a-z0-9\\(\\)_-]+) *([~!\\|\\*$^=]*) *'?\"?([^'\"]*)'?\"? *\\]", "i" );
+jQuery.filter = function(t,r,not) {
+	var g = jQuery.grep;
+	if ( not === false )
+		g = function(a,f) {return jQuery.grep(a,f,true);};
+
+	while ( t && t.match(/^[:\\.#\\[a-zA-Z\\*]/) ) {
+		var re = /^\[ *@([a-z*_-][a-z0-9()_-]*) *([~!|*$^=]*) *'?"?([^'"]*)'?"? *\]/i;
 		var m = re.exec(t);
-		
-		if ( m != null ) {
-			m = ['', '@', m[2], m[1], m[3]];
-		} else {
-			var re = new RegExp( "^(\\[) *([^\\]]*) *\\]", "i" );
-			var m = re.exec(t);
-			
-			if ( m == null ) {
-				var re = new RegExp( "^(:)([a-z0-9\\*_-]*)\\( *[\"']?([^ \\)'\"]*)['\"]? *\\)", "i" );
-				var m = re.exec(t);
-				
-				if ( m == null ) {
-					var re = new RegExp( "^([:\\.#]*)([a-z0-9\\*_-]*)", "i" );
-					var m = re.exec(t);
+
+		if ( m )
+			m = ["", "@", m[2], m[1], m[3]];
+		else {
+			re = /^(\[) *([^\]]*) *\]/i;
+			m = re.exec(t);
+
+			if ( !m ) {
+				re = /^(:)([a-z0-9*_-]*)\( *["']?([^ \)'"]*)['"]? *\)/i;
+				m = re.exec(t);
+
+				if ( !m ) {
+					re = /^([:\.#]*)([a-z0-9*_-]*)/i;
+					m = re.exec(t);
 				}
 			}
 		}
 		t = t.replace( re, "" );
-		
+
 		if ( m[1] == ":" && m[2] == "not" )
-			r = $.filter(m[3],r,false).r;
+			r = jQuery.filter(m[3],r,false).r;
 		else {
-			if ( $.g[m[1]].constructor == String )
-				var f = $.g[m[1]];
-			else if ( $.g[m[1]][m[2]] )
-				var f = $.g[m[1]][m[2]];
-						
-			if ( f != null ) {
+			var f = null;
+
+			if ( jQuery.g[m[1]].constructor == String )
+				f = jQuery.g[m[1]];
+			else if ( jQuery.g[m[1]][m[2]] )
+				f = jQuery.g[m[1]][m[2]];
+
+			if ( f ) {
 				eval("f = function(a,i){return " + f + "}");
 				r = g( r, f );
 			}
 		}
 	}
+
 	return { r: r, t: t };
 };
 
-$.parents = function(a){
+jQuery.parents = function(a){
 	var b = [];
 	var c = a.parentNode;
-	while ( c != null && c != document ) {
+	while ( c && c != document ) {
 		b[b.length] = c;
 		c = c.parentNode;
 	}
 	return b;
 };
 
-$.cleanSpaces = function(t){return t.replace(/^\s+|\s+$/g, '')};
-
-$.ofType = function(a,n,e) {
-  var t = $.grep($.sibling(a),function(b){return b.nodeName == a.nodeName});
-  if ( e ) n = t.length - n - 1;
-  return n != null ? t[n] == a : t.length;
+jQuery.cleanSpaces = function(t){
+	return t.replace(/^\s+|\s+$/g, "");
 };
 
-$.sibling = function(a,n,e) {
-  var type = [];
-  var tmp = a.parentNode.childNodes;
-  for ( var i = 0; i < tmp.length; i++ ) {
-    if ( tmp[i].nodeType == 1 )
-      type[type.length] = tmp[i];
-    if ( tmp[i] == a )
-      type.n = type.length - 1;
-  }
-  if ( e ) n = type.length - n - 1;
-  type.cur = ( type[n] == a );
-  type.prev = ( type.n > 0 ? type[type.n - 1] : null );
-  type.next = ( type.n < type.length - 1 ? type[type.n + 1] : null );
-  return type;
+jQuery.ofType = function(a,n,e) {
+	var t = jQuery.grep(jQuery.sibling(a),function(b){ return b.nodeName == a.nodeName; });
+	if ( e ) n = t.length - n - 1;
+	return n != undefined ? t[n] == a : t.length;
 };
 
-$.hasWord = function(e,a) {
-  if ( e == null ) return false;
-  if ( e.className != null ) e = e.className;
-  return new RegExp("(^|\\s)" + a + "(\\s|$)").test(e)
+jQuery.sibling = function(a,n,e) {
+	var type = [];
+	var tmp = a.parentNode.childNodes;
+	for ( var i = 0; i < tmp.length; i++ ) {
+		if ( tmp[i].nodeType == 1 )
+			type[type.length] = tmp[i];
+		if ( tmp[i] == a )
+			type.n = type.length - 1;
+	}
+	if ( e ) n = type.length - n - 1;
+	type.cur = ( type[n] == a );
+	type.prev = ( type.n > 0 ? type[type.n - 1] : null );
+	type.next = ( type.n < type.length - 1 ? type[type.n + 1] : null );
+	return type;
 };
 
-$.getAll = function(o,r) {
-	r = r || [];
-	var s = o.childNodes;
-	for ( var i = 0; i < s.length; i++ ) {
-		if ( s[i].nodeType == 1 ) {
-			r[r.length] = s[i];
-			$.getAll( s[i], r );
-		}
-	}
-	return r;
+jQuery.hasWord = function(e,a) {
+	if ( e == undefined ) return;
+	if ( e.className ) e = e.className;
+	return new RegExp("(^|\\s)" + a + "(\\s|$)").test(e);
 };
 
-$.merge = function(a,b) {
+jQuery.merge = function(a,b) {
 	var d = [];
-	for ( var j = 0; j < b.length; j++ )
-		d[j] = b[j];
-	
-  for ( var i = 0; i < a.length; i++ ) {
-    var c = true;
-    for ( var j = 0; j < b.length; j++ )
-      if ( a[i] == b[j] )
-        c = false;
-		if ( c )
-			d[d.length] = a[i];
-  }
+	for ( var k = 0; k < b.length; k++ ) d[k] = b[k];
+
+	for ( var i = 0; i < a.length; i++ ) {
+		var c = true;
+		for ( var j = 0; j < b.length; j++ )
+			if ( a[i] == b[j] )
+				c = false;
+		if ( c ) d[d.length] = a[i];
+	}
+
 	return d;
 };
 
-$.grep = function(a,f,s) {
-  var r = [];
-	if ( a != null )
+jQuery.grep = function(a,f,s) {
+	if ( f.constructor == String )
+		f = new Function("a","i","return " + f);
+	var r = [];
+	if ( a )
 		for ( var i = 0; i < a.length; i++ )
 			if ( (!s && f(a[i],i)) || (s && !f(a[i],i)) )
 				r[r.length] = a[i];
-  return r;
-};
-
-$.map = function(a,f) {
-  var r = [];
-  for ( var i = 0; i < a.length; i++ ) {
-    var t = f(a[i],i);
-    if ( t != null ) {
-      if ( t.constructor != Array ) t = [t];
-			r = $.merge( t, r );
-		}
-  }
-  return r;
+	return r;
 };
 
-// Bind an event to an element
-// Original by Dean Edwards
-function addEvent(element, type, handler) {
-	if ( element.location ) element = window; // Ughhhhh....
-	if (!handler.$$guid) handler.$$guid = addEvent.guid++;
-	if (!element.events) element.events = {};
-	var handlers = element.events[type];
-	if (!handlers) {
-		handlers = element.events[type] = {};
-		if (element["on" + type])
-			handlers[0] = element["on" + type];
-	}
-	handlers[handler.$$guid] = handler;
-	element["on" + type] = handleEvent;
-};
-addEvent.guid = 1;
-
-// Detach an event or set of events from an element
-function removeEvent(element, type, handler) {
-	if (element.events) {
-		if (type && element.events[type]) {
-			if ( handler ) {
-				delete element.events[type][handler.$$guid];
-			} else {
-				for ( var i in element.events[type] )
-					delete element.events[type][i];
-			}
-		} else {
-			for ( var i in element.events )
-				removeEvent( element, i );
+jQuery.map = function(a,f) {
+	if ( f.constructor == String )
+		f = new Function("a","return " + f);
+	
+	var r = [];
+	for ( var i = 0; i < a.length; i++ ) {
+		var t = f(a[i],i);
+		if ( t !== null && t != undefined ) {
+			if ( t.constructor != Array ) t = [t];
+			r = jQuery.merge( t, r );
 		}
 	}
+	return r;
 };
 
-function triggerEvent(element,type) {
-  if ( element["on" + type] )
-    element["on" + type]({ type: type });
-}
+jQuery.event = {
 
-function handleEvent(event) {
-	var returnValue = true;
-	event = event || fixEvent(window.event);
-	var handlers = [];
-	for ( var i in this.events[event.type] )
-		handlers[handlers.length] = this.events[event.type][i];
-  for ( var i = 0; i < handlers.length; i++ ) {
-		try {
+	// Bind an event to an element
+	// Original by Dean Edwards
+	add: function(element, type, handler) {
+		// For whatever reason, IE has trouble passing the window object
+		// around, causing it to be cloned in the process
+		if ( jQuery.browser == "msie" && element.setInterval != undefined )
+			element = window;
+	
+		if (!handler.guid) handler.guid = jQuery.event.guid++;
+		if (!element.events) element.events = {};
+		var handlers = element.events[type];
+		if (!handlers) {
+			handlers = element.events[type] = {};
+			if (element["on" + type])
+				handlers[0] = element["on" + type];
+		}
+		handlers[handler.guid] = handler;
+		element["on" + type] = this.handle;
+
+		if (!this.global[type])
+			this.global[type] = [];
+		this.global[type].push( element );
+	},
+	
+	guid: 1,
+	global: {},
+	
+	// Detach an event or set of events from an element
+	remove: function(element, type, handler) {
+		if (element.events)
+			if (type && element.events[type])
+				if ( handler )
+					delete element.events[type][handler.guid];
+				else
+					for ( var i in element.events[type] )
+						delete element.events[type][i];
+			else
+				for ( var j in element.events )
+					this.remove( element, j );
+	},
+	
+	trigger: function(type,data,element) {
+		// Touch up the incoming data
+		data = data || [];
+
+		// Handle a global trigger
+		if ( !element ) {
+			var g = this.global[type];
+			if ( g )
+				for ( var i = 0; i < g.length; i++ )
+					this.trigger( type, data, g[i] );
+
+		// Handle triggering a single element
+		} else if ( element["on" + type] ) {
+			// Pass along a fake event
+			data.unshift( this.fix({ type: type, target: element }) );
+
+			// Trigger the event
+			element["on" + type].apply( element, data );
+		}
+	},
+	
+	handle: function(event) {
+		// Handle adding events to items in IFrames, in IE
+		event = event ||
+			jQuery.event.fix( ((this.ownerDocument || this.document || 
+				this).parentWindow || window).event );
+
+		// If no correct event was found, fail
+		if ( !event ) return;
+	
+		var returnValue = true, handlers = [];
+	
+		for ( var j in this.events[event.type] )
+			handlers[handlers.length] = this.events[event.type][j];
+	
+		for ( var i = 0; i < handlers.length; i++ )
 			if ( handlers[i].constructor == Function ) {
-				this.$$handleEvent = handlers[i];
-				if (this.$$handleEvent(event) === false) {
+				this.handleEvent = handlers[i];
+				if (this.handleEvent(event) === false) {
 					event.preventDefault();
 					event.stopPropagation();
 					returnValue = false;
 				}
 			}
-		} catch(e){}
+		return returnValue;
+	},
+	
+	fix: function(event) {
+		if ( event ) {
+			event.preventDefault = function() {
+				this.returnValue = false;
+			};
+		
+			event.stopPropagation = function() {
+				this.cancelBubble = true;
+			};
+		}
+		
+		return event;
 	}
-	return returnValue;
-};
 
-function fixEvent(event) {
-	event.preventDefault = fixEvent.preventDefault;
-	event.stopPropagation = fixEvent.stopPropagation;
-	return event;
 };
-fixEvent.preventDefault = function() {
-	this.returnValue = false;
-};
-fixEvent.stopPropagation = function() {
-	this.cancelBubble = true;
-};
-
-// Move to module
-
-$.fn.text = function(e) {
-	e = e || this.cur;
-	var t = "";
-	for ( var j = 0; j < e.length; j++ ) {
-		for ( var i = 0; i < e[j].childNodes.length; i++ )
-		 	t += e[j].childNodes[i].nodeType != 1 ?
-				e[j].childNodes[i].nodeValue :
-				$.fn.text(e[j].childNodes[i].childNodes);
-	}
-	return t;
-};
-
-setTimeout(function(){
-  if ( typeof Prototype != "undefined" && $.g == null && $.clean == null )
-    throw "Error: You are overwriting jQuery, please include jQuery last.";
-}, 1000);