X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=ef728f032da1dacd7be62b7ace5f138abceed9ca;hb=fdd437800d983346c5936abedcf292c2a612b892;hp=fe8b32bc5f57b2ac46e711a16cdb8f640d5b3480;hpb=fd249ca808408166882847c217d55ae4c5a799e8;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index fe8b32b..ef728f0 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -24,7 +24,7 @@ window.undefined = window.undefined;
  */
 var jQuery = function(a,c) {
 	// If the context is global, return a new object
-	if ( window == this )
+	if ( window == this || !this.init )
 		return new jQuery(a,c);
 	
 	return this.init(a,c);
@@ -1443,7 +1443,7 @@ jQuery.extend({
 		}
 		
 		if (prop.match(/float/i))
-			prop = jQuery.browser.msie ? "styleFloat" : "cssFloat";
+			prop = jQuery.styleFloat;
 
 		if (!force && elem.style[prop])
 			ret = elem.style[prop];
@@ -1539,7 +1539,7 @@ jQuery.extend({
 				arg = jQuery.makeArray( div.childNodes );
 			}
 
-			if ( 0 === arg.length && !jQuery(arg).is("form, select") )
+			if ( 0 === arg.length && (!jQuery.nodeName(arg, "form") && !jQuery.nodeName(arg, "select")) )
 				return;
 
 			if ( arg[0] == undefined || jQuery.nodeName(arg, "form") || arg.options )
@@ -1820,12 +1820,14 @@ new function() {
 	// Check to see if the W3C box model is being used
 	jQuery.boxModel = !jQuery.browser.msie || document.compatMode == "CSS1Compat";
 
+	jQuery.styleFloat = jQuery.browser.msie ? "styleFloat" : "cssFloat",
+
 	jQuery.props = {
 		"for": "htmlFor",
 		"class": "className",
-		"float": jQuery.browser.msie ? "styleFloat" : "cssFloat",
-		cssFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
-		styleFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
+		"float": jQuery.styleFloat,
+		cssFloat: jQuery.styleFloat,
+		styleFloat: jQuery.styleFloat,
 		innerHTML: "innerHTML",
 		className: "className",
 		value: "value",