X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=118b4148756141428e64a525f2751abad5b5bc88;hb=1501447c7066bb7684dcfc34fb1dd3df512862de;hp=d04aa6199a0ec381b72f8420f78d556566db60ac;hpb=74a8e206231162b005d95b667343678f786ae272;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index d04aa61..118b414 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -26,37 +26,8 @@ var jQuery = function(a,c) {
 	// If the context is global, return a new object
 	if ( window == this )
 		return new jQuery(a,c);
-
-	// Make sure that a selection was provided
-	a = a || document;
-	
-	// HANDLE: $(function)
-	// Shortcut for document ready
-	if ( jQuery.isFunction(a) )
-		return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a );
-	
-	// Handle HTML strings
-	if ( typeof a  == "string" ) {
-		// HANDLE: $(html) -> $(array)
-		var m = /^[^<]*(<(.|\s)+>)[^>]*$/.exec(a);
-		if ( m )
-			a = jQuery.clean( [ m[1] ] );
-		
-		// HANDLE: $(expr)
-		else
-			return new jQuery( c ).find( a );
-	}
 	
-	return this.setArray(
-		// HANDLE: $(array)
-		a.constructor == Array && a ||
-
-		// HANDLE: $(arraylike)
-		// Watch for when an array-like object is passed as the selector
-		(a.jquery || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType) && jQuery.makeArray( a ) ||
-
-		// HANDLE: $(*)
-		[ a ] );
+	return this.init(a,c);
 };
 
 // Map over the $ in case of overwrite
@@ -170,6 +141,48 @@ var $ = jQuery;
 
 jQuery.fn = jQuery.prototype = {
 	/**
+	 * Initialize a new jQuery object
+	 *
+	 * @private
+	 * @name init
+	 * @param String|Function|Element|Array<Element>|jQuery a selector
+	 * @param jQuery|Element|Array<Element> c context
+	 * @cat Core
+	 */
+	init: function(a,c) {
+		// Make sure that a selection was provided
+		a = a || document;
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		if ( jQuery.isFunction(a) )
+			return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a );
+
+		// Handle HTML strings
+		if ( typeof a  == "string" ) {
+			// HANDLE: $(html) -> $(array)
+			var m = /^[^<]*(<(.|\s)+>)[^>]*$/.exec(a);
+			if ( m )
+				a = jQuery.clean( [ m[1] ] );
+
+			// HANDLE: $(expr)
+			else
+				return new jQuery( c ).find( a );
+		}
+
+		return this.setArray(
+			// HANDLE: $(array)
+			a.constructor == Array && a ||
+
+			// HANDLE: $(arraylike)
+			// Watch for when an array-like object is passed as the selector
+			(a.jquery || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType) && jQuery.makeArray( a ) ||
+
+			// HANDLE: $(*)
+			[ a ] );
+	},
+	
+	/**
 	 * The current version of jQuery.
 	 *
 	 * @private
@@ -1465,7 +1478,7 @@ jQuery.extend({
 					!s.indexOf("<leg") &&
 					[1, "<fieldset>", "</fieldset>"] ||
 					
-					(!s.indexOf("<thead") || !s.indexOf("<tbody") || !s.indexOf("<tfoot")) &&
+					(!s.indexOf("<thead") || !s.indexOf("<tbody") || !s.indexOf("<tfoot") || !s.indexOf("<colg")) &&
 					[1, "<table>", "</table>"] ||
 					
 					!s.indexOf("<tr") &&
@@ -1475,6 +1488,9 @@ jQuery.extend({
 					(!s.indexOf("<td") || !s.indexOf("<th")) &&
 					[3, "<table><tbody><tr>", "</tr></tbody></table>"] ||
 					
+					!s.indexOf("<col") &&
+					[2, "<table><colgroup>", "</colgroup></table>"] ||
+					
 					[0,"",""];
 
 				// Go to html and back, then peel off extra wrappers
@@ -1783,7 +1799,7 @@ new function() {
 
 	// Figure out what browser is being used
 	jQuery.browser = {
-		version: b.match(/.+[xiae][\/ ]([\d.]+)/)[1],
+		version: b.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)[1],
 		safari: /webkit/.test(b),
 		opera: /opera/.test(b),
 		msie: /msie/.test(b) && !/opera/.test(b),