X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=jquery%2Fjquery.js;h=c24e7949ea5887b469a2b42520d6ac91e4f606b7;hb=f197c7469f43c02bcbc65f2f41e2b419f0379700;hp=97fa48ee508857a6d7d32fa9922903618b76e2f2;hpb=0fd3648d45be72bcfe76b95715b38dd5904b47da;p=jquery.git

diff --git a/jquery/jquery.js b/jquery/jquery.js
index 97fa48e..c24e794 100644
--- a/jquery/jquery.js
+++ b/jquery/jquery.js
@@ -1,5 +1,5 @@
 /*
- * jQuery
+ * jQuery - New Wave Javascript
  *
  * Copyright (c) 2006 John Resig (jquery.com)
  * Licensed under the MIT License:
@@ -12,25 +12,50 @@
 // Global undefined variable
 window.undefined = window.undefined;
 
+// Map over the $ in case of overwrite
+if ( $ ) var _$ = $;
+
 /**
  * Create a new jQuery Object
  * @constructor
  */
-function jQuery(a,c) {
+var $ = jQuery = function(a,c) {
+	/*
+ 	* 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 && 
+      
+		// 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 )
+
+			// Use the default method, in case it works some voodoo
+			return _$( a );
+
+	// Watch for when a jQuery object is passed in as an arg
+	if ( a && a.jquery )
+		return 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
 	);
 }
 
-/**
- * The jQuery query object.
- */
-var $ = jQuery;
-
 jQuery.fn = jQuery.prototype = {
 	/**
 	 * The current SVN version of jQuery.
@@ -67,7 +92,7 @@ jQuery.fn = jQuery.prototype = {
 	},
 	set: function(a,b) {
 		return this.each(function(){
-			if ( b == undefined )
+			if ( b === undefined )
 				for ( var j in a )
 					jQuery.attr(this,j,a[j]);
 			else
@@ -85,18 +110,19 @@ jQuery.fn = jQuery.prototype = {
 	text: function(e) {
 		e = e || this.get();
 		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 :
-					jQuery.fn.text(e[j].childNodes[i].childNodes);
+		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 ?
+		return a.constructor != String || b ?
 			this.each(function(){
-				if ( !b )
+				if ( b === undefined )
 					for ( var j in a )
 						jQuery.attr(this.style,j,a[j]);
 				else
@@ -147,8 +173,9 @@ jQuery.fn = jQuery.prototype = {
 		});
 	},
 	remove: function() {
-		this.each(function(){this.parentNode.removeChild( this );});
-		return this.pushStack( [] );
+		return this.each(function(){
+			this.parentNode.removeChild( this );
+		});
 	},
 	
 	wrap: function() {
@@ -245,7 +272,7 @@ jQuery.fn = jQuery.prototype = {
 	},
 	
 	parent: function(a) {
-		var ret = jQuery.map(this.cur,"d.parentNode");
+		var ret = jQuery.map(this.cur,"a.parentNode");
 		if ( a ) ret = jQuery.filter(a,ret).r;
 		return this.pushStack(ret);
 	},
@@ -457,9 +484,9 @@ jQuery.g = {
 		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==false",
+		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"
 	},
@@ -493,7 +520,8 @@ jQuery.token = [
 
 jQuery.Select = function( t, context ) {
 	context = context || jQuery.context || document;
-	if ( t.constructor != String ) return [t];
+	if ( t.constructor != String )
+		return t.constructor == Array ? t : [t];
 
 	if ( !t.indexOf("//") ) {
 		context = context.documentElement;
@@ -725,7 +753,7 @@ jQuery.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 !== null && t != undefined ) {
 			if ( t.constructor != Array ) t = [t];
 			r = jQuery.merge( t, r );
 		}
@@ -778,15 +806,20 @@ jQuery.event = {
 	},
 	
 	handle: function(event) {
-		if ( !event && !window.event ) return;
+		// 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 = [];
-		event = event || jQuery.event.fix(window.event);
 	
 		for ( var j in this.events[event.type] )
 			handlers[handlers.length] = this.events[event.type][j];
 	
-		for ( var i = 0; i < handlers.length; i++ ) {
+		for ( var i = 0; i < handlers.length; i++ )
 			if ( handlers[i].constructor == Function ) {
 				this.handleEvent = handlers[i];
 				if (this.handleEvent(event) === false) {
@@ -795,18 +828,19 @@ jQuery.event = {
 					returnValue = false;
 				}
 			}
-		}
 		return returnValue;
 	},
 	
 	fix: function(event) {
-		event.preventDefault = function() {
-			this.returnValue = false;
-		};
+		if ( event ) {
+			event.preventDefault = function() {
+				this.returnValue = false;
+			};
 		
-		event.stopPropagation = function() {
-			this.cancelBubble = true;
-		};
+			event.stopPropagation = function() {
+				this.cancelBubble = true;
+			};
+		}
 		
 		return event;
 	}