X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=jquery%2Fjquery.js;h=419b6e135de58aa8def6c9db1e47ea9d36694025;hb=0027439156fb97bef30f6084d85898ec5b16155f;hp=8ca3870337c44ec1066fd8167a792a56cce059fd;hpb=73f55becc5e056ad28f6aec22ec014ffb3ab913b;p=jquery.git

diff --git a/jquery/jquery.js b/jquery/jquery.js
index 8ca3870..419b6e1 100644
--- a/jquery/jquery.js
+++ b/jquery/jquery.js
@@ -12,11 +12,35 @@
 // 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;
@@ -32,37 +56,6 @@ function jQuery(a,c) {
 	);
 }
 
-/**
- * The jQuery query object.
- */
-if ( !window.$ )
-  var $ = jQuery;
-
-/*
- * Handle support for overriding other $() functions. Way too many libraries
- * provide this function to simply ignore it and overwrite it.
- */
-else
-  var $ = function(a,c) {
-    // 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 ) {
-          
-      // Only return the element if it's  found
-      var obj = document.getElementById(a);
-      if ( obj ) return obj;
-      
-    }
-    
-    return jQuery(a,c);
-  };
-
 jQuery.fn = jQuery.prototype = {
 	/**
 	 * The current SVN version of jQuery.
@@ -811,15 +804,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) {
@@ -828,18 +826,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;
 	}