X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=jquery%2Fjquery.js;h=4ba40ff80c648dbc0d8713def70ff304c55f85c4;hb=414d059941343fa3c6bbbf40d3cb55cba4c4c85e;hp=0afafc5acc873793f0384f7ad093e1b563947940;hpb=9b6df19cc4dcc03760aee8a6df95a0d3c8585780;p=jquery.git

diff --git a/jquery/jquery.js b/jquery/jquery.js
index 0afafc5..4ba40ff 100644
--- a/jquery/jquery.js
+++ b/jquery/jquery.js
@@ -12,50 +12,65 @@
 // Global undefined variable
 window.undefined = window.undefined;
 
-// Map over the $ in case of overwrite
-if ( $ ) var _$ = $;
-
 /**
  * Create a new jQuery Object
  * @constructor
  */
-var $ = jQuery = function(a,c) {
+function jQuery(a,c) {
+
+	// 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.
- 	*/
+ 	 * 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 ( _$ && !c && ( a.constructor == String && 
+	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 ) ||
-
-		// Watch for an array being passed in (Prototype 1.5)
-		a.constructor == Array )
+		!document.getElementsByTagName(a).length )
 
 			// Use the default method, in case it works some voodoo
-			return _$( a );
+			return jQuery._$( a );
 
-	// Watch for when a jQuery object is passed in as an arg
-	if ( a && a.jquery )
+	// 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);
-	
-	// Find the matching elements and save them for later
-	this.cur = jQuery.Select(
-		a || jQuery.context || document,
-		c && c.jquery && c.get(0) || 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.
@@ -71,7 +86,7 @@ jQuery.fn = jQuery.prototype = {
 	 * @type Number
 	 */
 	size: function() {
-		return this.get().length;
+		return this.length;
 	},
 	
 	/**
@@ -82,12 +97,22 @@ jQuery.fn = jQuery.prototype = {
 	 * @type Array,DOMElement
 	 */
 	get: function(num) {
-		return num == undefined ? this.cur : this.cur[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.get(i), [i] );
+			f.apply( this[i], [i] );
 		return this;
 	},
 	set: function(a,b) {
@@ -101,14 +126,14 @@ jQuery.fn = jQuery.prototype = {
 	},
 	html: function(h) {
 		return h == undefined && this.size() ?
-			this.get(0).innerHTML : this.set( "innerHTML", h );
+			this[0].innerHTML : this.set( "innerHTML", h );
 	},
 	val: function(h) {
 		return h == undefined && this.size() ?
-			this.get(0).value : this.set( "value", h );
+			this[0].value : this.set( "value", h );
 	},
 	text: function(e) {
-		e = e || this.get();
+		e = e || this;
 		var t = "";
 		for ( var j = 0; j < e.length; j++ ) {
 			var r = e[j].childNodes;
@@ -127,7 +152,7 @@ jQuery.fn = jQuery.prototype = {
 						jQuery.attr(this.style,j,a[j]);
 				else
 					jQuery.attr(this.style,a,b);
-			}) : jQuery.css( this.get(0), a );
+			}) : jQuery.css( this[0], a );
 	},
 	toggle: function() {
 		return this.each(function(){
@@ -250,65 +275,73 @@ jQuery.fn = jQuery.prototype = {
 		return this.each(function(){jQuery.event.trigger(this,t);});
 	},
 	
-	pushStack: function(a) {
-		if ( !this.stack ) this.stack = [];
-		this.stack.unshift( this.cur );
-		if ( a ) this.cur = a;
+	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;
 	},
-	
-	find: function(t) {
-		var ret = [];
-		this.each(function(){
-			ret = jQuery.merge( ret, jQuery.Select(t,this) );
-		});
-		this.pushStack( ret );
+
+	end: function() {
+		this.get( this.stack.pop() );
 		return this;
 	},
 	
-	end: function() {
-		this.cur = this.stack.shift();
-		return this;
+	find: function(t) {
+		return this.pushStack( $.map( this, function(a){
+			return jQuery.Select(t,a);
+		}), arguments );
 	},
 	
 	parent: function(a) {
-		var ret = jQuery.map(this.cur,"a.parentNode");
+		var ret = jQuery.map(this,"a.parentNode");
 		if ( a ) ret = jQuery.filter(a,ret).r;
-		return this.pushStack(ret);
+		return this.pushStack( ret, arguments );
 	},
 	
 	parents: function(a) {
-		var ret = jQuery.map(this.cur,jQuery.parents);
+		var ret = jQuery.map(this,jQuery.parents);
 		if ( a ) ret = jQuery.filter(a,ret).r;
-		return this.pushStack(ret);
+		return this.pushStack( ret, arguments );
 	},
 	
 	siblings: function(a) {
 		// Incorrect, need to exclude current element
-		var ret = jQuery.map(this.cur,jQuery.sibling);
+		var ret = jQuery.map(this,jQuery.sibling);
 		if ( a ) ret = jQuery.filter(a,ret).r;
-		return this.pushStack(ret);
+		return this.pushStack( ret, arguments );
 	},
 	
 	filter: function(t) {
 		if ( /,/.test(t) ) {
 			var p = t.split(/\s*,\s*/);
-			return this.pushStack( $.map(this.cur,function(a){
+			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.cur).r );
+			return this.pushStack( jQuery.filter(t,this).r, arguments );
 	},
 	not: function(t) {
 		return this.pushStack( t.constructor == String ?
-			jQuery.filter(t,this.cur,false).r :
-			jQuery.grep(this.cur,function(a){ return a != t; }) );
+			jQuery.filter(t,this,false).r :
+			jQuery.grep(this,function(a){ return a != t; }), arguments );
 	},
 	add: function(t) {
-		return this.pushStack( jQuery.merge( this.cur, t.constructor == String ?
-			jQuery.Select(t) : t.constructor == Array ? t : [t] ) );
+		return this.pushStack( jQuery.merge( this, t.constructor == String ?
+			jQuery.Select(t) : t.constructor == Array ? t : [t] ), arguments );
 	},
 	
 	/**
@@ -321,7 +354,7 @@ jQuery.fn = jQuery.prototype = {
 	 * @type Boolean
 	 */
 	is: function(expr) {
-		return jQuery.filter(expr,this.cur).r.length > 0;
+		return jQuery.filter(expr,this).r.length > 0;
 	},
 	
 	/**
@@ -353,6 +386,22 @@ jQuery.fn = jQuery.prototype = {
 	}
 };
 
+/**
+ * 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;
@@ -524,9 +573,14 @@ jQuery.token = [
 ];
 
 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;
-	if ( t.constructor != String )
-		return t.constructor == Array ? t : [t];
+
+	if ( t.constructor != String ) return [t];
 
 	if ( !t.indexOf("//") ) {
 		context = context.documentElement;
@@ -544,10 +598,10 @@ jQuery.Select = function( t, context ) {
 	var last = null;
 
 	while ( t.length > 0 && last != t ) {
-    var r = [];
+		var r = [];
 		last = t;
 
-    t = jQuery.cleanSpaces(t).replace( /^\/\//i, "" );
+		t = jQuery.cleanSpaces(t).replace( /^\/\//i, "" );
 		
 		var foundToken = false;
 		
@@ -642,7 +696,7 @@ jQuery.filter = function(t,r,not) {
 		g = function(a,f) {return jQuery.grep(a,f,true);};
 
 	while ( t && t.match(/^[:\\.#\\[a-zA-Z\\*]/) ) {
-		var re = /^\[ *@([a-z0-9*()_-]+) *([~!|*$^=]*) *'?"?([^'"]*)'?"? *\]/i;
+		var re = /^\[ *@([a-z*_-][a-z0-9()_-]*) *([~!|*$^=]*) *'?"?([^'"]*)'?"? *\]/i;
 		var m = re.exec(t);
 
 		if ( m )
@@ -785,10 +839,15 @@ jQuery.event = {
 				handlers[0] = element["on" + type];
 		}
 		handlers[handler.guid] = handler;
-		element["on" + type] = jQuery.event.handle;
+		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) {
@@ -801,13 +860,28 @@ jQuery.event = {
 						delete element.events[type][i];
 			else
 				for ( var j in element.events )
-					jQuery.event.remove( element, j );
+					this.remove( element, j );
 	},
 	
-	trigger: function(element,type,data) {
-		data = data || [ jQuery.event.fix({ type: type }) ];
-		if ( element && element["on" + type] )
+	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) {