X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcore.js;h=35cac37b747c73470c7087abb25f1e8833c71004;hb=b7a3b220a8a2b5b0378c9f176ca5ae0f786a6fcf;hp=a74f0fec9d69b7a6908bd21f913353019962691a;hpb=1a7f72e7fe96654838074f88c79e021d37c5c30a;p=jquery.git

diff --git a/src/core.js b/src/core.js
index a74f0fe..35cac37 100644
--- a/src/core.js
+++ b/src/core.js
@@ -20,16 +20,24 @@ var jQuery = function( selector, context ) {
 
 	// A simple way to check for HTML strings or ID strings
 	// (both of which we optimize for)
-	quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,
+	quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,
 
 	// Is it a simple selector
 	isSimple = /^.[^:#\[\.,]*$/,
 
+	// Check if a string has a non-whitespace character in it
+	rnotwhite = /\S/,
+
+	// Used for trimming whitespace
+	rtrim = /^\s+|\s+$/g,
+
 	// Keep a UserAgent string for use with jQuery.browser
 	userAgent = navigator.userAgent.toLowerCase(),
 
-	// Save a reference to the core toString method
-	toString = Object.prototype.toString;
+	// Save a reference to some core methods
+	toString = Object.prototype.toString,
+	push = Array.prototype.push,
+	slice = Array.prototype.slice;
 
 // Expose jQuery to the global object
 window.jQuery = window.$ = jQuery;
@@ -39,7 +47,9 @@ jQuery.fn = jQuery.prototype = {
 		var match, elem, ret;
 
 		// Handle $(""), $(null), or $(undefined)
-		if ( !selector ) return this;
+		if ( !selector ) {
+			return this;
+		}
 
 		// Handle $(DOMElement)
 		if ( selector.nodeType ) {
@@ -62,12 +72,14 @@ jQuery.fn = jQuery.prototype = {
 
 				// HANDLE: $("#id")
 				} else {
-					elem = document.getElementById( match[3] );
+					elem = document.getElementById( match[2] );
 
 					if ( elem ) {
 						// Handle the case where IE and Opera return items
 						// by name instead of ID
-						if ( elem.id !== match[3] ) return rootjQuery.find( selector );
+						if ( elem.id !== match[2] ) {
+							return rootjQuery.find( selector );
+						}
 
 						// Otherwise, we inject the element directly into the jQuery object
 						this.length++;
@@ -120,7 +132,9 @@ jQuery.fn = jQuery.prototype = {
 		return this.length;
 	},
 
-	toArray: Array.prototype.slice,
+	toArray: function(){
+		return slice.call( this, 0 );
+	},
 
 	// Get the Nth element in the matched element set OR
 	// Get the whole matched element set as a clean array
@@ -131,7 +145,7 @@ jQuery.fn = jQuery.prototype = {
 			this.toArray() :
 
 			// Return just the object
-			( num < 0 ? this.toArray(num)[ 0 ] : this[ num ] );
+			( num < 0 ? this.slice(num)[ 0 ] : this[ num ] );
 	},
 
 	// Take an array of elements and push it onto the stack
@@ -162,7 +176,7 @@ jQuery.fn = jQuery.prototype = {
 		// Resetting the length to 0, then using the native Array push
 		// is a super-fast way to populate an object with array-like properties
 		this.length = 0;
-		Array.prototype.push.apply( this, elems );
+		push.apply( this, elems );
 
 		return this;
 	},
@@ -195,7 +209,7 @@ jQuery.fn = jQuery.prototype = {
 
 	// For internal use only.
 	// Behaves like an Array's method, not like a jQuery method.
-	push: [].push,
+	push: push,
 	sort: [].sort,
 	splice: [].splice
 };
@@ -243,10 +257,15 @@ jQuery.extend = jQuery.fn.extend = function() {
 				if ( deep && copy && typeof copy === "object" && !copy.nodeType ) {
 					var clone;
 
-					if( src ) clone = src;
-					else if( jQuery.isArray(copy) ) clone = [ ];
-					else if( jQuery.isObject(copy) ) clone = { };
-					else clone = copy;
+					if ( src ) {
+						clone = src;
+					} else if ( jQuery.isArray(copy) ) {
+						clone = [];
+					} else if ( jQuery.isObject(copy) ) {
+						clone = {};
+					} else {
+						clone = copy;
+					}
 
 					// Never move original objects, clone them
 					target[ name ] = jQuery.extend( deep, clone, copy );
@@ -290,26 +309,29 @@ jQuery.extend({
 	},
 
 	isEmptyObject: function( obj ) {
-		for(var name in obj)
+		for ( var name in obj ) {
 			return false;
+		}
 		return true;
 	},
 
 	// check if an element is in a (or is an) XML document
 	isXMLDoc: function( elem ) {
-		return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" ||
-			!!elem.ownerDocument && elem.ownerDocument.documentElement.nodeName !== "HTML";
+		// documentElement is verified for cases where it doesn't yet exist
+		// (such as loading iframes in IE - #4833)
+		return ((elem.ownerDocument || elem).documentElement || 0).nodeName !== "HTML";
 	},
 
 	// Evalulates a script in a global context
 	globalEval: function( data ) {
-		if ( data && /\S/.test(data) ) {
+		if ( data && rnotwhite.test(data) ) {
 			// Inspired by code by Andrea Giammarchi
 			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
 			var head = document.getElementsByTagName("head")[0] || document.documentElement,
 				script = document.createElement("script");
 
 			script.type = "text/javascript";
+
 			if ( jQuery.support.scriptEval ) {
 				script.appendChild( document.createTextNode( data ) );
 			} else {
@@ -366,7 +388,7 @@ jQuery.extend({
 	},
 
 	trim: function( text ) {
-		return (text || "").replace( /^\s+|\s+$/g, "" );
+		return (text || "").replace( rtrim, "" );
 	},
 
 	makeArray: function( array ) {
@@ -474,7 +496,7 @@ jQuery.extend({
 	// It's included for backwards compatibility and plugins,
 	// although they should work to migrate away.
 	browser: {
-		version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [0,'0'])[1],
+		version: (/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/.exec(userAgent) || [0,'0'])[1],
 		safari: /webkit/.test( userAgent ),
 		opera: /opera/.test( userAgent ),
 		msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ),