X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=d46f89d16a00c087accbeff5885787fbd9670af0;hb=7f27816d3068bff70eecfcf18366b54345750efe;hp=e988d48f982cb9015720c9221823891be5ff30cf;hpb=b13a961ff58553ad76f134a3504d0c567f1703da;p=jquery.git

diff --git a/src/core.js b/src/core.js
index e988d48..d46f89d 100644
--- a/src/core.js
+++ b/src/core.js
@@ -401,6 +401,9 @@ jQuery.fn = jQuery.prototype = {
 			return undefined;
 		}
 
+		if( value.constructor == Number )
+			value += '';
+
 		return this.each(function(){
 			if ( this.nodeType != 1 )
 				return;
@@ -410,9 +413,7 @@ jQuery.fn = jQuery.prototype = {
 					jQuery.inArray(this.name, value) >= 0);
 
 			else if ( jQuery.nodeName( this, "select" ) ) {
-				var values = value.constructor == Array ?
-					value :
-					[ value ];
+				var values = jQuery.makeArray(value);
 
 				jQuery( "option", this ).each(function(){
 					this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
@@ -429,7 +430,7 @@ jQuery.fn = jQuery.prototype = {
 
 	html: function( value ) {
 		return value == undefined ?
-			(this.length ?
+			(this[0] ?
 				this[0].innerHTML :
 				null) :
 			this.empty().append( value );
@@ -506,9 +507,9 @@ jQuery.fn = jQuery.prototype = {
 					this;
 
 				// execute all scripts after the elements have been injected
-				if ( jQuery.nodeName( elem, "script" ) ) {
+				if ( jQuery.nodeName( elem, "script" ) )
 					scripts = scripts.add( elem );
-				} else {
+				else {
 					// Remove any inner scripts for later evaluation
 					if ( elem.nodeType == 1 )
 						scripts = scripts.add( jQuery( "script", elem ).remove() );
@@ -596,11 +597,10 @@ jQuery.extend = jQuery.fn.extend = function() {
 };
 
 var expando = "jQuery" + now(), uuid = 0, windowData = {},
-
-// exclude the following css properties to add px
+	// exclude the following css properties to add px
 	exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
-// cache getComputedStyle
-	getComputedStyle = document.defaultView && document.defaultView.getComputedStyle;
+	// cache defaultView
+	defaultView = document.defaultView || {};
 
 jQuery.extend({
 	noConflict: function( deep ) {
@@ -640,7 +640,9 @@ jQuery.extend({
 			else
 				script.appendChild( document.createTextNode( data ) );
 
-			head.appendChild( script );
+			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+			// This arises when a base node is used (#2709).
+			head.insertBefore( script, head.firstChild );
 			head.removeChild( script );
 		}
 	},
@@ -746,14 +748,14 @@ jQuery.extend({
 	},
 
 	prop: function( elem, value, type, i, name ) {
-			// Handle executable functions
-			if ( jQuery.isFunction( value ) )
-				value = value.call( elem, i );
-
-			// Handle passing in a number to a CSS property
-			return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ?
-				value + "px" :
-				value;
+		// Handle executable functions
+		if ( jQuery.isFunction( value ) )
+			value = value.call( elem, i );
+
+		// Handle passing in a number to a CSS property
+		return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ?
+			value + "px" :
+			value;
 	},
 
 	className: {
@@ -775,7 +777,7 @@ jQuery.extend({
 					"";
 		},
 
-		// internal only, use is(".class")
+		// internal only, use hasClass("class")
 		has: function( elem, className ) {
 			return jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1;
 		}
@@ -830,8 +832,8 @@ jQuery.extend({
 			if ( !jQuery.browser.safari )
 				return false;
 
-			// getComputedStyle is cached
-			var ret = getComputedStyle( elem, null );
+			// defaultView is cached
+			var ret = defaultView.getComputedStyle( elem, null );
 			return !ret || ret.getPropertyValue("color") == "";
 		}
 
@@ -857,7 +859,7 @@ jQuery.extend({
 		if ( !force && style && style[ name ] )
 			ret = style[ name ];
 
-		else if ( getComputedStyle ) {
+		else if ( defaultView.getComputedStyle ) {
 
 			// Only "float" is needed here
 			if ( name.match( /float/i ) )
@@ -865,7 +867,7 @@ jQuery.extend({
 
 			name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
 
-			var computedStyle = getComputedStyle( elem, null );
+			var computedStyle = defaultView.getComputedStyle( elem, null );
 
 			if ( computedStyle && !color( elem ) )
 				ret = computedStyle.getPropertyValue( name );
@@ -1359,3 +1361,8 @@ jQuery.each([ "Height", "Width" ], function(i, name){
 					this.css( type, size.constructor == String ? size : size + "px" );
 	};
 });
+
+// Helper function used by the dimensions and offset modules
+function num(elem, prop) {
+	return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0;
+}
\ No newline at end of file