X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=567e6a0fa807350b87d7d77859f79b7965e2c5a6;hb=83e98c28ef8aba11e525bf4266f8454232236ca0;hp=03db89cb1f5d91fbfbad55f6d8eefb4b88f2940c;hpb=83b0e17f3fc1b0ed9993827d2308c344392926d4;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 03db89c..567e6a0 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -31,7 +31,7 @@ window.undefined = window.undefined;
 var jQuery = function(a,c) {
 
 	// Shortcut for document ready (because $(document).each() is silly)
-	if ( a && typeof a == "function" && jQuery.fn.ready )
+	if ( a && typeof a == "function" && jQuery.fn.ready && !a.nodeType && a[0] == undefined ) // Safari reports typeof on DOM NodeLists as a function
 		return jQuery(document).ready(a);
 
 	// Make sure that a selection was provided
@@ -944,12 +944,15 @@ jQuery.fn = jQuery.prototype = {
 	 * @result $("p").find("span").end() == [ <p>...</p> ]
 	 *
 	 * @test ok( 'Yahoo' == $('#yahoo').parent().end().text(), 'Check for end' );
+	 * ok( $('#yahoo').end(), 'Check for end with nothing to end' );
 	 *
 	 * @name end
 	 * @type jQuery
 	 * @cat DOM/Traversing
 	 */
 	end: function() {
+		if( !(this.stack && this.stack.length) )
+			return this;
 		return this.get( this.stack.pop() );
 	},
 
@@ -1565,14 +1568,12 @@ jQuery.extend({
 				// Go to html and back, then peel off extra wrappers
 				div.innerHTML = wrap[1] + s + wrap[2];
 				while ( wrap[0]-- ) div = div.firstChild;
-				
-				// Have to loop through the childNodes here to 
-				// prevent a Safari crash with text nodes and /n characters
-				for ( var j = 0; j < div.childNodes.length; j++ )
-					r.push( div.childNodes[j] );
+				arg = div.childNodes;
 			} 
-			else if ( arg.length != undefined && !arg.nodeType ) // Handles Array, jQuery, DOM NodeList collections
-				for ( var n = 0; n < arg.length; n++ )
+			
+			
+			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
 					r.push(arg[n]);
 			else
 				r.push(	arg.nodeType ? arg : document.createTextNode(arg.toString()) );
@@ -1695,10 +1696,6 @@ jQuery.extend({
 	 * t( "Attribute Exists", "a[@title]", ["google"] );
 	 * t( "Attribute Exists", "*[@title]", ["google"] );
 	 * t( "Attribute Exists", "[@title]", ["google"] );
-	 * 
-	 * t( "Non-existing part of attribute", "[@name*=bla]", [] ); 
-	 * t( "Non-existing start of attribute", "[@name^=bla]", [] ); 
-	 * t( "Non-existing end of attribute", "[@name$=bla]", [] ); 
 	 *
 	 * t( "Attribute Equals", "a[@rel='bookmark']", ["simon1"] );
 	 * t( "Attribute Equals", 'a[@rel="bookmark"]', ["simon1"] );
@@ -1734,8 +1731,8 @@ jQuery.extend({
 	 * t( "Attribute Exists", "//a[@title]", ["google"] );
 	 * t( "Attribute Equals", "//a[@rel='bookmark']", ["simon1"] );
 	 * t( "Parent Axis", "//p/..", ["main","foo"] );
-	 * t( "Sibling Axis", "//p/../", ["firstp","ap","foo","first","firstUL","empty","form","sndp","en","sap"] );
-	 * t( "Sibling Axis", "//p/../*", ["firstp","ap","foo","first","firstUL","empty","form","sndp","en","sap"] );
+	 * t( "Sibling Axis", "//p/../", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","sndp","en","sap"] );
+	 * t( "Sibling Axis", "//p/../*", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","sndp","en","sap"] );
 	 * t( "Has Children", "//p[a]", ["firstp","ap","en","sap"] );
 	 *
 	 * t( "nth Element", "p:nth(1)", ["ap"] );
@@ -1906,7 +1903,7 @@ jQuery.extend({
 			return elem[fix[name]];
 		} else if( value == undefined && jQuery.browser.msie && elem.nodeName && elem.nodeName.toUpperCase() == 'FORM' && (name == 'action' || name == 'method') ) {
 			return elem.getAttributeNode(name).nodeValue;
-		} else if ( elem.getAttribute != undefined && elem.tagName ) { // IE elem.getAttribute passes even for style
+		} else if ( (jQuery.browser.msie || elem.getAttribute != undefined) && elem.tagName ) { // IE elem.getAttribute passes even for style; Do not "call" elem.getAttribute in IE <- weird crap
 			if ( value != undefined ) elem.setAttribute( name, value );
 			return elem.getAttribute( name );
 		} else {
@@ -2271,7 +2268,7 @@ jQuery.extend({
 		handle: function(event) {
 			if ( typeof jQuery == "undefined" ) return false;
 
-			event = event || jQuery.event.fix( window.event );
+			event = jQuery.event.fix( event || window.event || {} ); // Empty object is for triggered events with no data
 
 			// If no correct event was found, fail
 			if ( !event ) return false;
@@ -2291,16 +2288,18 @@ jQuery.extend({
 				}
 			}
 
+			// Clean up added properties in IE to prevent memory leak
+			if (jQuery.browser.msie) event.target = event.preventDefault = event.stopPropagation = null;
+
 			return returnValue;
 		},
 
 		fix: function(event) {
 			// check IE
 			if(jQuery.browser.msie) {
-				// get real event from window.event
-				event = window.event;
 				// fix target property
 				event.target = event.srcElement;
+				
 			// check safari and if target is a textnode
 			} else if(jQuery.browser.safari && event.target.nodeType == 3) {
 				// target is readonly, clone the event object
@@ -2308,16 +2307,20 @@ jQuery.extend({
 				// get parentnode from textnode
 				event.target = event.target.parentNode;
 			}
+			
 			// fix preventDefault and stopPropagation
-			event.preventDefault = function() {
-				this.returnValue = false;
-			};
-			event.stopPropagation = function() {
-				this.cancelBubble = true;
-			};
+			if (!event.preventDefault)
+				event.preventDefault = function() {
+					this.returnValue = false;
+				};
+				
+			if (!event.stopPropagation)
+				event.stopPropagation = function() {
+					this.cancelBubble = true;
+				};
+			
 			return event;
 		}
-
 	}
 });
 
@@ -3096,7 +3099,7 @@ jQuery.macros = {
 		 *
 		 * It only returns the immediately previous sibling, not all previous siblings.
 		 *
-		 * @example $("p").previous(".selected")
+		 * @example $("p").prev(".selected")
 		 * @before <div><span>Hello</span></div><p class="selected">Hello Again</p><p>And Again</p>
 		 * @result [ <div><span>Hello</span></div> ]
 		 *