X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=8b28fdbccfcf06a57090e95688600a21edcbfae5;hp=88930f227a4c6875b7eee5289617f57e90c2ea3b;hb=c3d8cb0c09c2d7d5f0fc3a78f8b4cef9b0adc640;hpb=8937e088b6f06a0dbef36348aef5d7c10f3af340

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 88930f2..8b28fdb 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -510,9 +510,9 @@ jQuery.fn = jQuery.prototype = {
 
 		e = e || this;
 		var t = "";
-		for ( var j = 0; j < e.length; j++ ) {
+		for ( var j = 0, el = e.length; j < el; j++ ) {
 			var r = e[j].childNodes;
-			for ( var i = 0; i < r.length; i++ )
+			for ( var i = 0, rl = r.length; i < rl; i++ )
 				if ( r[i].nodeType != 8 )
 					t += r[i].nodeType != 1 ?
 						r[i].nodeValue : jQuery.fn.text([ r[i] ]);
@@ -882,7 +882,7 @@ jQuery.fn = jQuery.prototype = {
 		return this.pushStack(
 			t.constructor == Array &&
 			jQuery.map(this,function(a){
-				for ( var i = 0; i < t.length; i++ )
+				for ( var i = 0, tl = t.length; i < tl; i++ )
 					if ( jQuery.filter(t[i],[a]).r.length )
 						return a;
 				return null;
@@ -1030,7 +1030,7 @@ jQuery.fn = jQuery.prototype = {
 			if ( table && this.nodeName.toUpperCase() == "TABLE" && a[0].nodeName.toUpperCase() == "TR" )
 				obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));
 
-			for ( var i=0; i < a.length; i++ )
+			for ( var i = 0, al = a.length; i < al; i++ )
 				fn.apply( obj, [ clone ? a[i].cloneNode(true) : a[i] ] );
 
 		});
@@ -1164,7 +1164,7 @@ jQuery.extend({
 			jQuery.fn[ i ] = function(){
 				var a = arguments;
 				return this.each(function(){
-					for ( var j = 0; j < a.length; j++ )
+					for ( var j = 0, al = a.length; j < al; j++ )
 						jQuery(a[j])[n]( this );
 				});
 			};
@@ -1229,27 +1229,26 @@ jQuery.extend({
 			for ( var i in obj )
 				fn.apply( obj[i], args || [i, obj[i]] );
 		else
-			for ( var i = 0; i < obj.length; i++ )
+			for ( var i = 0, ol = obj.length; i < ol; i++ )
 				if ( fn.apply( obj[i], args || [i, obj[i]] ) === false ) break;
 		return obj;
 	},
 
 	className: {
 		add: function( elem, c ){
-			if ( jQuery.className.has( elem, c ) )
-                return;
-			elem.className += ( elem.className ? " " : "" ) + c;
+			jQuery.each( c.split(/\s+/), function(i, cur){
+				if ( !jQuery.className.has( elem.className, cur ) )
+					elem.className += ( elem.className ? " " : "" ) + cur;
+			});
 		},
 		remove: function( elem, c ){
             elem.className = c ?
-                jQuery.grep( elem.className.split(/\s+/), function(cur){ 
-				    return jQuery.className.has( c, cur );	
+                jQuery.grep( elem.className.split(/\s+/), function(cur){
+				    return !jQuery.className.has( c, cur );	
                 }).join(' ') : "";
 		},
-		has: function( elem, c ){
-			if ( elem.className != undefined )
-				elem = elem.className;
-			return new RegExp("(^|\\s)" + c + "(\\s|$)").test( elem );
+		has: function( classes, c ){
+			return classes && new RegExp("(^|\\s)" + c + "(\\s|$)").test( classes );
 		}
 	},
 
@@ -1271,7 +1270,7 @@ jQuery.extend({
 		if ( p == "height" || p == "width" ) {
 			var old = {}, oHeight, oWidth, d = ["Top","Bottom","Right","Left"];
 
-			for ( var i=0; i<d.length; i++ ) {
+			for ( var i = 0, dl = d.length; i < dl; i++ ) {
 				old["padding" + d[i]] = 0;
 				old["border" + d[i] + "Width"] = 0;
 			}
@@ -1350,7 +1349,7 @@ jQuery.extend({
 	
 	clean: function(a) {
 		var r = [];
-		for ( var i = 0; i < a.length; i++ ) {
+		for ( var i = 0, al = a.length; i < al; i++ ) {
 			var arg = a[i];
 			if ( typeof arg == "string" ) { // Convert html string into DOM nodes
 				// Trim whitespace, otherwise indexOf won't work as expected
@@ -1391,7 +1390,7 @@ jQuery.extend({
 			
 			
 			if ( arg.length != undefined && ( (jQuery.browser.safari && typeof arg == 'function') || !arg.nodeType ) ) // Safari reports typeof on a DOM NodeList to be a function
-				for ( var n = 0; n < arg.length; n++ ) // Handles Array, jQuery, DOM NodeList collections
+				for ( var n = 0, argl = arg.length; n < argl; n++ ) // Handles Array, jQuery, DOM NodeList collections
 					r.push(arg[n]);
 			else
 				r.push(	arg.nodeType ? arg : document.createTextNode(arg.toString()) );
@@ -1399,336 +1398,7 @@ jQuery.extend({
 
 		return r;
 	},
-
-	/**
-	 * A handy, and fast, way to traverse in a particular direction and find
-	 * a specific element.
-	 *
-	 * @private
-	 * @name $.nth
-	 * @type DOMElement
-	 * @param DOMElement cur The element to search from.
-	 * @param Number|String num The Nth result to match. Can be a number or a string (like 'even' or 'odd').
-	 * @param String dir The direction to move in (pass in something like 'previousSibling' or 'nextSibling').
-	 * @cat DOM/Traversing
-	 */
-	nth: function(cur,result,dir){
-		result = result || 1;
-		var num = 0;
-		for ( ; cur; cur = cur[dir] ) {
-			if ( cur.nodeType == 1 ) num++;
-			if ( num == result || result == "even" && num % 2 == 0 && num > 1 ||
-				result == "odd" && num % 2 == 1 ) return cur;
-		}
-	},
-
-	expr: {
-		"": "m[2]== '*'||a.nodeName.toUpperCase()==m[2].toUpperCase()",
-		"#": "a.getAttribute('id')==m[2]",
-		":": {
-			// Position Checks
-			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",
-
-			// Child Checks
-			"nth-child": "jQuery.nth(a.parentNode.firstChild,m[3],'nextSibling')==a",
-			"first-child": "jQuery.nth(a.parentNode.firstChild,1,'nextSibling')==a",
-			"last-child": "jQuery.nth(a.parentNode.lastChild,1,'previousSibling')==a",
-			"only-child": "jQuery.sibling(a.parentNode.firstChild).length==1",
-
-			// Parent Checks
-			parent: "a.childNodes.length",
-			empty: "!a.childNodes.length",
-
-			// Text Check
-			contains: "jQuery.fn.text.apply([a]).indexOf(m[3])>=0",
-
-			// Visibility
-			visible: "a.type!='hidden'&&jQuery.css(a,'display')!='none'&&jQuery.css(a,'visibility')!='hidden'",
-			hidden: "a.type=='hidden'||jQuery.css(a,'display')=='none'||jQuery.css(a,'visibility')=='hidden'",
-
-			// Form attributes
-			enabled: "!a.disabled",
-			disabled: "a.disabled",
-			checked: "a.checked",
-			selected: "a.selected || jQuery.attr(a, 'selected')",
-
-			// Form elements
-			text: "a.type=='text'",
-			radio: "a.type=='radio'",
-			checkbox: "a.type=='checkbox'",
-			file: "a.type=='file'",
-			password: "a.type=='password'",
-			submit: "a.type=='submit'",
-			image: "a.type=='image'",
-			reset: "a.type=='reset'",
-			button: "a.type=='button'||a.nodeName=='BUTTON'",
-			input: "/input|select|textarea|button/i.test(a.nodeName)"
-		},
-		".": "jQuery.className.has(a,m[2])",
-		"@": {
-			"=": "z==m[4]",
-			"!=": "z!=m[4]",
-			"^=": "z && !z.indexOf(m[4])",
-			"$=": "z && z.substr(z.length - m[4].length,m[4].length)==m[4]",
-			"*=": "z && z.indexOf(m[4])>=0",
-			"": "z",
-			_resort: function(m){
-				return ["", m[1], m[3], m[2], m[5]];
-			},
-			_prefix: "z=jQuery.attr(a,m[3]);"
-		},
-		"[": "jQuery.find(m[2],a).length"
-	},
-
-	/**
-	 * All elements on a specified axis.
-	 *
-	 * @private
-	 * @name $.sibling
-	 * @type Array
-	 * @param Element elem The element to find all the siblings of (including itself).
-	 * @cat DOM/Traversing
-	 */
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType == 1 && (!elem || n != elem) )
-				r.push( n );
-		}
-
-		return r;
-	},
-
-	token: [
-		"\\.\\.|/\\.\\.", "a.parentNode",
-		">|/", "jQuery.sibling(a.firstChild)",
-		"\\+", "jQuery.nth(a,2,'nextSibling')",
-		"~", function(a){
-			var s = jQuery.sibling(a.parentNode.firstChild)
-			return s.slice(0, jQuery.inArray(a,s));
-		}
-	],
-
-	/**
-	 * @name $.find
-	 * @type Array<Element>
-	 * @private
-	 * @cat Core
-	 */
-	find: function( t, context ) {
-		// Quickly handle non-string expressions
-		if ( typeof t != "string" )
-			return [ t ];
-
-		// Make sure that the context is a DOM Element
-		if ( context && context.nodeType == undefined )
-			context = null;
-
-		// Set the correct context (if none is provided)
-		context = context || document;
-
-		// Handle the common XPath // expression
-		if ( !t.indexOf("//") ) {
-			context = context.documentElement;
-			t = t.substr(2,t.length);
-
-		// And the / root expression
-		} else if ( !t.indexOf("/") ) {
-			context = context.documentElement;
-			t = t.substr(1,t.length);
-			if ( t.indexOf("/") >= 1 )
-				t = t.substr(t.indexOf("/"),t.length);
-		}
-
-		// Initialize the search
-		var ret = [context], done = [], last = null;
-
-		// Continue while a selector expression exists, and while
-		// we're no longer looping upon ourselves
-		while ( t && last != t ) {
-			var r = [];
-			last = t;
-
-			t = jQuery.trim(t).replace( /^\/\//i, "" );
-
-			var foundToken = false;
-
-			// An attempt at speeding up child selectors that
-			// point to a specific element tag
-			var re = /^[\/>]\s*([a-z0-9*-]+)/i;
-			var m = re.exec(t);
-
-			if ( m ) {
-				// Perform our own iteration and filter
-				for ( var i = 0; i < ret.length; i++ )
-					for ( var c = ret[i].firstChild; c; c = c.nextSibling )
-						if ( c.nodeType == 1 && ( c.nodeName == m[1].toUpperCase() || m[1] == "*" ) )
-							r.push( c );
-
-				ret = r;
-				t = jQuery.trim( t.replace( re, "" ) );
-				foundToken = true;
-			} else {
-				// Look for pre-defined expression tokens
-				for ( var i = 0; i < jQuery.token.length; i += 2 ) {
-					// Attempt to match each, individual, token in
-					// the specified order
-					var re = new RegExp("^(" + jQuery.token[i] + ")");
-					var m = re.exec(t);
-
-					// If the token match was found
-					if ( m ) {
-						// Map it against the token's handler
-						r = ret = jQuery.map( ret, jQuery.token[i+1].constructor == Function ?
-							jQuery.token[i+1] :
-							function(a){ return eval(jQuery.token[i+1]); });
-
-						// And remove the token
-						t = jQuery.trim( t.replace( re, "" ) );
-						foundToken = true;
-						break;
-					}
-				}
-			}
-
-			// See if there's still an expression, and that we haven't already
-			// matched a token
-			if ( t && !foundToken ) {
-				// Handle multiple expressions
-				if ( !t.indexOf(",") || !t.indexOf("|") ) {
-					// Clean teh result set
-					if ( ret[0] == context ) ret.shift();
-
-					// Merge the result sets
-					jQuery.merge( done, ret );
-
-					// Reset the context
-					r = ret = [context];
-
-					// Touch up the selector string
-					t = " " + t.substr(1,t.length);
-
-				} else {
-					// Optomize for the case nodeName#idName
-					var re2 = /^([a-z0-9_-]+)(#)([a-z0-9\\*_-]*)/i;
-					var m = re2.exec(t);
-					
-					// Re-organize the results, so that they're consistent
-					if ( m ) {
-					   m = [ 0, m[2], m[3], m[1] ];
-
-					} else {
-						// Otherwise, do a traditional filter check for
-						// ID, class, and element selectors
-						re2 = /^([#.]?)([a-z0-9\\*_-]*)/i;
-						m = re2.exec(t);
-					}
-
-					// Try to do a global search by ID, where we can
-					if ( m[1] == "#" && ret[ret.length-1].getElementById ) {
-						// Optimization for HTML document case
-						var oid = ret[ret.length-1].getElementById(m[2]);
-
-						// Do a quick check for node name (where applicable) so
-						// that div#foo searches will be really fast
-						ret = r = oid && 
-						  (!m[3] || oid.nodeName == m[3].toUpperCase()) ? [oid] : [];
-
-					// Use the DOM 0 shortcut for the body element
-					} else if ( m[1] == "" && m[2] == "body" ) {
-						ret = r = [ document.body ];
-
-					} else {
-						// Pre-compile a regular expression to handle class searches
-						if ( m[1] == "." )
-							var rec = new RegExp("(^|\\s)" + m[2] + "(\\s|$)");
-
-						// We need to find all descendant elements, it is more
-						// efficient to use getAll() when we are already further down
-						// the tree - we try to recognize that here
-						for ( var i = 0; i < ret.length; i++ )
-							jQuery.merge( r,
-								m[1] != "" && ret.length != 1 ?
-									jQuery.getAll( ret[i], [], m[1], m[2], rec ) :
-									ret[i].getElementsByTagName( m[1] != "" || m[0] == "" ? "*" : m[2] )
-							);
-
-						// It's faster to filter by class and be done with it
-						if ( m[1] == "." && ret.length == 1 )
-							r = jQuery.grep( r, function(e) {
-								return rec.test(e.className);
-							});
-
-						// Same with ID filtering
-						if ( m[1] == "#" && ret.length == 1 ) {
-							// Remember, then wipe out, the result set
-							var tmp = r;
-							r = [];
-
-							// Then try to find the element with the ID
-							for ( var i = 0; i < tmp.length; i++ )
-								if ( tmp[i].getAttribute("id") == m[2] ) {
-									r = [ tmp[i] ];
-									break;
-								}
-						}
-
-						ret = r;
-					}
-
-					t = t.replace( re2, "" );
-				}
-
-			}
-
-			// If a selector string still exists
-			if ( t ) {
-				// Attempt to filter it
-				var val = jQuery.filter(t,r);
-				ret = r = val.r;
-				t = jQuery.trim(val.t);
-			}
-		}
-
-		// Remove the root context
-		if ( ret && ret[0] == context ) ret.shift();
-
-		// And combine the results
-		jQuery.merge( done, ret );
-
-		return done;
-	},
-
-	getAll: function( o, r, token, name, re ) {
-		for ( var s = o.firstChild; s; s = s.nextSibling )
-			if ( s.nodeType == 1 ) {
-				var add = true;
-
-				if ( token == "." )
-					add = s.className && re.test(s.className);
-				else if ( token == "#" )
-					add = s.getAttribute('id') == name;
 	
-				if ( add )
-					r.push( s );
-
-				if ( token == "#" && r.length ) break;
-
-				if ( s.firstChild )
-					jQuery.getAll( s, r, token, name, re );
-			}
-
-		return r;
-	},
-
 	attr: function(elem, name, value){
 		var fix = {
 			"for": "htmlFor",
@@ -1782,84 +1452,7 @@ jQuery.extend({
 			return elem[name];
 		}
 	},
-
-	// The regular expressions that power the parsing engine
-	parse: [
-		// Match: [@value='test'], [@foo]
-		"\\[ *(@)S *([!*$^=]*) *('?\"?)(.*?)\\4 *\\]",
-
-		// Match: [div], [div p]
-		"(\\[)\\s*(.*?)\\s*\\]",
-
-		// Match: :contains('foo')
-		"(:)S\\(\"?'?([^\\)]*?)\"?'?\\)",
-
-		// Match: :even, :last-chlid
-		"([:.#]*)S"
-	],
-
-	filter: function(t,r,not) {
-		// Look for common filter expressions
-		while ( t && /^[a-z[({<*:.#]/i.test(t) ) {
-
-			var p = jQuery.parse;
-
-			for ( var i = 0; i < p.length; i++ ) {
-		
-				// Look for, and replace, string-like sequences
-				// and finally build a regexp out of it
-				var re = new RegExp(
-					"^" + p[i].replace("S", "([a-z*_-][a-z0-9_-]*)"), "i" );
-
-				var m = re.exec( t );
-
-				if ( m ) {
-					// Re-organize the first match
-					if ( jQuery.expr[ m[1] ]._resort )
-						m = jQuery.expr[ m[1] ]._resort( m );
-
-					// Remove what we just matched
-					t = t.replace( re, "" );
-
-					break;
-				}
-			}
-
-			// :not() is a special case that can be optimized by
-			// keeping it out of the expression list
-			if ( m[1] == ":" && m[2] == "not" )
-				r = jQuery.filter(m[3], r, true).r;
-
-			// Handle classes as a special case (this will help to
-			// improve the speed, as the regexp will only be compiled once)
-			else if ( m[1] == "." ) {
-
-				var re = new RegExp("(^|\\s)" + m[2] + "(\\s|$)");
-				r = jQuery.grep( r, function(e){
-					return re.test(e.className || '');
-				}, not);
-
-			// Otherwise, find the expression to execute
-			} else {
-				var f = jQuery.expr[m[1]];
-				if ( typeof f != "string" )
-					f = jQuery.expr[m[1]][m[2]];
-
-				// Build a custom macro to enclose it
-				eval("f = function(a,i){" +
-					( jQuery.expr[ m[1] ]._prefix || "" ) +
-					"return " + f + "}");
-
-				// Execute it against the current filter
-				r = jQuery.grep( r, f, not );
-			}
-		}
-
-		// Return an array of filtered elements (r)
-		// and the modified expression string (t)
-		return { r: r, t: t };
-	},
-
+	
 	/**
 	 * Remove the whitespace from the beginning and end of a string.
 	 *
@@ -1875,30 +1468,11 @@ jQuery.extend({
 		return t.replace(/^\s+|\s+$/g, "");
 	},
 
-	/**
-	 * All ancestors of a given element.
-	 *
-	 * @private
-	 * @name $.parents
-	 * @type Array<Element>
-	 * @param Element elem The element to find the ancestors of.
-	 * @cat DOM/Traversing
-	 */
-	parents: function( elem ){
-		var matched = [];
-		var cur = elem.parentNode;
-		while ( cur && cur != document ) {
-			matched.push( cur );
-			cur = cur.parentNode;
-		}
-		return matched;
-	},
-
 	makeArray: function( a ) {
 		var r = [];
 
 		if ( a.constructor != Array ) {
-			for ( var i = 0; i < a.length; i++ )
+			for ( var i = 0, al = a.length; i < al; i++ )
 				r.push( a[i] );
 		} else
 			r = a.slice( 0 );
@@ -1907,7 +1481,7 @@ jQuery.extend({
 	},
 
 	inArray: function( b, a ) {
-		for ( var i = 0; i < a.length; i++ )
+		for ( var i = 0, al = a.length; i < al; i++ )
 			if ( a[i] == b )
 				return i;
 		return -1;
@@ -1935,7 +1509,7 @@ jQuery.extend({
 
 		// Now check for duplicates between the two arrays
 		// and only add the unique items
-		for ( var i = 0; i < second.length; i++ ) {
+		for ( var i = 0, sl = second.length; i < sl; i++ ) {
 			// Check for duplicates
 			if ( jQuery.inArray( second[i], r ) == -1 )
 				// The item is unique, add it
@@ -1974,7 +1548,7 @@ jQuery.extend({
 
 		// Go through the array, only saving the items
 		// that pass the validator function
-		for ( var i = 0; i < elems.length; i++ )
+		for ( var i = 0, el = elems.length; i < el; i++ )
 			if ( !inv && fn(elems[i],i) || inv && !fn(elems[i],i) )
 				result.push( elems[i] );
 
@@ -2020,7 +1594,7 @@ jQuery.extend({
 
 		// Go through the array, translating each of the items to their
 		// new value (or values).
-		for ( var i = 0; i < elems.length; i++ ) {
+		for ( var i = 0, el = elems.length; i < el; i++ ) {
 			var val = fn(elems[i],i);
 
 			if ( val !== null && val != undefined ) {
@@ -2031,7 +1605,7 @@ jQuery.extend({
 
 		var r = [ result[0] ];
 
-		check: for ( var i = 1; i < result.length; i++ ) {
+		check: for ( var i = 1, rl = result.length; i < rl; i++ ) {
 			for ( var j = 0; j < i; j++ )
 				if ( result[i] == r[j] )
 					continue check;
@@ -2040,165 +1614,6 @@ jQuery.extend({
 		}
 
 		return r;
-	},
-
-	/*
-	 * A number of helper functions used for managing events.
-	 * Many of the ideas behind this code orignated from Dean Edwards' addEvent library.
-	 */
-	event: {
-
-		// Bind an event to an element
-		// Original by Dean Edwards
-		add: function(element, type, handler, data) {
-			// 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 data is passed, bind to handler
-			if( data ) 
-				handler.data = data;
-
-			// Make sure that the function being executed has a unique ID
-			if ( !handler.guid )
-				handler.guid = this.guid++;
-
-			// Init the element's event structure
-			if (!element.events)
-				element.events = {};
-
-			// Get the current list of functions bound to this event
-			var handlers = element.events[type];
-
-			// If it hasn't been initialized yet
-			if (!handlers) {
-				// Init the event handler queue
-				handlers = element.events[type] = {};
-
-				// Remember an existing handler, if it's already there
-				if (element["on" + type])
-					handlers[0] = element["on" + type];
-			}
-
-			// Add the function to the element's handler list
-			handlers[handler.guid] = handler;
-
-			// And bind the global event handler to the element
-			element["on" + type] = this.handle;
-
-			// Remember the function in a global list (for triggering)
-			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 && type.type )
-					delete element.events[ type.type ][ type.handler.guid ];
-				else 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) {
-			// Clone the incoming data, if any
-			data = jQuery.makeArray(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) {
-			if ( typeof jQuery == "undefined" ) return false;
-
-			event = jQuery.event.fix( event || window.event || {} ); // Empty object is for triggered events with no data
-
-			var returnValue = true;
-
-			var c = this.events[event.type];
-
-			var args = [].slice.call( arguments, 1 );
-			args.unshift( event );
-
-			for ( var j in c ) {
-				// Pass in a reference to the handler function itself
-				// So that we can later remove it
-				args[0].handler = c[j];
-				args[0].data = c[j].data;
-
-				if ( c[j].apply( this, args ) === false ) {
-					event.preventDefault();
-					event.stopPropagation();
-					returnValue = false;
-				}
-			}
-
-			// Clean up added properties in IE to prevent memory leak
-			if (jQuery.browser.msie) event.target = event.preventDefault = event.stopPropagation = event.handler = event.data = null;
-
-			return returnValue;
-		},
-
-		fix: function(event) {
-			// Fix target property, if necessary
-			if ( !event.target && event.srcElement )
-				event.target = event.srcElement;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( typeof event.pageX == "undefined" && typeof event.clientX != "undefined" ) {
-				var e = document.documentElement, b = document.body;
-				event.pageX = event.clientX + (e.scrollLeft || b.scrollLeft);
-				event.pageY = event.clientY + (e.scrollTop || b.scrollTop);
-			}
-					
-			// Check safari and if target is a textnode
-			if ( jQuery.browser.safari && event.target.nodeType == 3 ) {
-				// target is readonly, clone the event object
-				event = jQuery.extend({}, event);
-				// get parentnode from textnode
-				event.target = event.target.parentNode;
-			}
-			
-			// fix preventDefault and stopPropagation
-			if (!event.preventDefault) {
-				event.preventDefault = function() {
-					this.returnValue = false;
-				};
-			}
-				
-			if (!event.stopPropagation) {
-				event.stopPropagation = function() {
-					this.cancelBubble = true;
-				};
-			}
-				
-			return event;
-		}
 	}
 });
 
@@ -3180,117 +2595,6 @@ jQuery.macros = {
 		empty: function(){
 			while ( this.firstChild )
 				this.removeChild( this.firstChild );
-		},
-
-		/**
-		 * Binds a handler to a particular event (like click) for each matched element.
-		 * The event handler is passed an event object that you can use to prevent
-		 * default behaviour. To stop both default action and event bubbling, your handler
-		 * has to return false.
-		 *
-		 * In most cases, you can define your event handlers as anonymous functions
-		 * (see first example). In cases where that is not possible, you can pass additional
-		 * data as the second paramter (and the handler function as the third), see 
-		 * second example.
-		 *
-		 * @example $("p").bind( "click", function() {
-		 *   alert( $(this).text() );
-		 * } )
-		 * @before <p>Hello</p>
-		 * @result alert("Hello")
-		 *
-		 * @example var handler = function(event) {
-		 *   alert(event.data.foo);
-		 * };
-		 * $("p").bind( "click", {foo: "bar"}, handler)
-		 * @result alert("bar")
-		 * @desc Pass some additional data to the event handler.
-		 *
-		 * @example $("form").bind( "submit", function() { return false; } )
-		 * @desc Cancel a default action and prevent it from bubbling by returning false
-		 * from your function.
-		 *
-		 * @example $("form").bind( "submit", function(event) {
-		 *   event.preventDefault();
-		 * } );
-		 * @desc Cancel only the default action by using the preventDefault method.
-		 *
-		 *
-		 * @example $("form").bind( "submit", function(event) {
-		 *   event.stopPropagation();
-		 * } )
-		 * @desc Stop only an event from bubbling by using the stopPropagation method.
-		 *
-		 * @name bind
-		 * @type jQuery
-		 * @param String type An event type
-		 * @param Object data (optional) Additional data passed to the event handler as event.data
-		 * @param Function fn A function to bind to the event on each of the set of matched elements
-		 * @cat Events
-		 */
-		bind: function( type, data, fn ) {
-			jQuery.event.add( this, type, fn || data, data );
-		},
-
-		/**
-		 * The opposite of bind, removes a bound event from each of the matched
-		 * elements. You must pass the identical function that was used in the original
-		 * bind method.
-		 *
-		 * @example $("p").unbind( "click", function() { alert("Hello"); } )
-		 * @before <p onclick="alert('Hello');">Hello</p>
-		 * @result [ <p>Hello</p> ]
-		 *
-		 * @name unbind
-		 * @type jQuery
-		 * @param String type An event type
-		 * @param Function fn A function to unbind from the event on each of the set of matched elements
-		 * @cat Events
-		 */
-
-		/**
-		 * Removes all bound events of a particular type from each of the matched
-		 * elements.
-		 *
-		 * @example $("p").unbind( "click" )
-		 * @before <p onclick="alert('Hello');">Hello</p>
-		 * @result [ <p>Hello</p> ]
-		 *
-		 * @name unbind
-		 * @type jQuery
-		 * @param String type An event type
-		 * @cat Events
-		 */
-
-		/**
-		 * Removes all bound events from each of the matched elements.
-		 *
-		 * @example $("p").unbind()
-		 * @before <p onclick="alert('Hello');">Hello</p>
-		 * @result [ <p>Hello</p> ]
-		 *
-		 * @name unbind
-		 * @type jQuery
-		 * @cat Events
-		 */
-		unbind: function( type, fn ) {
-			jQuery.event.remove( this, type, fn );
-		},
-
-		/**
-		 * Trigger a type of event on every matched element.
-		 *
-		 * @example $("p").trigger("click")
-		 * @before <p click="alert('hello')">Hello</p>
-		 * @result alert('hello')
-		 *
-		 * @name trigger
-		 * @type jQuery
-		 * @param String type An event type to trigger.
-		 * @cat Events
-		 */
-		trigger: function( type, data ) {
-			jQuery.event.trigger( type, data, this );
 		}
 	}
 };