X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=686c20d7bfd69d4b78886792a88aa2bd41ac4ea6;hb=6f7cd669597cbcf026886074fb31963fe767e2b3;hp=7ac7ee6118c2e9bd547252eaf93c5e0b121fb03e;hpb=2e23d0168e6d820a0264792ef256fb33ec9bb700;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 7ac7ee6..686c20d 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -534,6 +534,14 @@ jQuery.fn = jQuery.prototype = {
 	 * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
 	 * $('#foo').css({display: 'block'});
 	 * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
+	 * $('#floatTest').css({styleFloat: 'right'});
+	 * ok( $('#floatTest').css('styleFloat') == 'right', 'Modified CSS float using "styleFloat": Assert float is right');
+	 * $('#floatTest').css({cssFloat: 'left'});
+	 * ok( $('#floatTest').css('cssFloat') == 'left', 'Modified CSS float using "cssFloat": Assert float is left');
+	 * $('#floatTest').css({'float': 'right'});
+	 * ok( $('#floatTest').css('cssFloat') == 'right', 'Modified CSS float using "cssFloat": Assert float is right');
+	 * $('#floatTest').css({'font-size': '30px'});
+	 * ok( $('#floatTest').css('font-size') == '30px', 'Modified CSS font-size: Assert font-size is 30px');
 	 * 
 	 * @name css
 	 * @type jQuery
@@ -555,6 +563,14 @@ jQuery.fn = jQuery.prototype = {
 	 * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
 	 * $('#foo').css('display', 'block');
 	 * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
+	 * $('#floatTest').css('styleFloat', 'left');
+	 * ok( $('#floatTest').css('styleFloat') == 'left', 'Modified CSS float using "styleFloat": Assert float is left');
+	 * $('#floatTest').css('cssFloat', 'right');
+	 * ok( $('#floatTest').css('cssFloat') == 'right', 'Modified CSS float using "cssFloat": Assert float is right');
+	 * $('#floatTest').css('float', 'left');
+	 * ok( $('#floatTest').css('cssFloat') == 'left', 'Modified CSS float using "cssFloat": Assert float is left');
+	 * $('#floatTest').css('font-size', '20px');
+	 * ok( $('#floatTest').css('font-size') == '20px', 'Modified CSS font-size: Assert font-size is 20px');
 	 *
 	 * @name css
 	 * @type jQuery
@@ -1501,6 +1517,9 @@ jQuery.extend({
 
 		} else if (document.defaultView && document.defaultView.getComputedStyle) {
 
+			if (prop == "cssFloat" || prop == "styleFloat")
+				prop = "float";
+
 			prop = prop.replace(/([A-Z])/g,"-$1").toLowerCase();
 			var cur = document.defaultView.getComputedStyle(elem, null);