X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=537b4e2bec7a6b250e435ad4cf97ac827d45c3a6;hb=902554a38da6c9e2d0c115bc189634d56f9b4d34;hp=9e59f9dad8a202bd4c5a9f7d855f164e3246b67a;hpb=f28f199dc0a353135ef8b9afa2f3d25c6ffd2c75;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 9e59f9d..537b4e2 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -306,9 +306,32 @@ jQuery.fn = jQuery.prototype = {
 	},
 	
 	val: function( val ) {
-		return val == undefined ?
-			( this.length ? this[0].value : null ) :
-			this.attr( "value", val );
+		if ( val == undefined ) {
+		    if ( this.length ) {
+		    	var elem = this[0];
+		    	
+		    	// We need to handle select boxes special
				if ( jQuery.nodeName(elem, "select") ) {
					var index = elem.selectedIndex,
+						a = [],
+						options = elem.options,
+						one = elem.type == "select-one";
+					
+					// Nothing was selected
					if ( index < 0 )
+						return null;
+
+					// Loop through all the selected options
					for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+						var option = options[i];
						if ( option.selected ) {
							// Get the specifc value for the option
							var val = jQuery.browser.msie && !option.attributes["value"].specified ? option.text : option.value;
+							
+							// We don't need an array for one selects
							if ( one )
+								return val;
+							
+							// Multi-Selects return an array
							a.push(val);
						}
					}
+					
					return a;
+					
+				// Everything else, we just grab the value
				} else
+					return this[0].value.replace(/\r/g, "");
+			}
+		} else
+			return this.attr( "value", val );
 	},
 	
 	html: function( val ) {
@@ -620,6 +643,21 @@ jQuery.extend({
 		} else if (elem.currentStyle) {
 			var newProp = prop.replace(/\-(\w)/g,function(m,c){return c.toUpperCase();});
 			ret = elem.currentStyle[prop] || elem.currentStyle[newProp];
+
+			// From the awesome hack by Dean Edwards
+			// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+			// If we're not dealing with a regular pixel number
+			// but a number that has a weird ending, we need to convert it to pixels
+			if ( !/^\d+(px)?$/i.test(ret) && /^\d/.test(ret) ) {
+				var style = elem.style.left;
+				var runtimeStyle = elem.runtimeStyle.left;
+				elem.runtimeStyle.left = elem.currentStyle.left;
+				elem.style.left = ret || 0;
+				ret = elem.style.pixelLeft + "px";
+				elem.style.left = style;
+				elem.runtimeStyle.left = runtimeStyle;
+			}
 		}
 
 		return ret;