Merge branch 'csshooks'

2 files changed, 26 insertions, 32 deletions

diff --git a/test/unit/css.js b/test/unit/css.js
index 5f8a74ae4..99bab1fe5 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,7 +1,7 @@
 module("css");
 
 test("css(String|Hash)", function() {
-	expect(30);
+	expect(28);
 
 	equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
 
@@ -19,10 +19,6 @@ test("css(String|Hash)", function() {
 	equals( parseFloat(jQuery('#nothiddendiv').css('width')), width, 'Test negative width ignored')
 	equals( parseFloat(jQuery('#nothiddendiv').css('height')), height, 'Test negative height ignored')
 
-	jQuery('#floatTest').css({styleFloat: 'right'});
-	equals( jQuery('#floatTest').css('styleFloat'), 'right', 'Modified CSS float using "styleFloat": Assert float is right');
-	jQuery('#floatTest').css({cssFloat: 'left'});
-	equals( jQuery('#floatTest').css('cssFloat'), 'left', 'Modified CSS float using "cssFloat": Assert float is left');
 	jQuery('#floatTest').css({'float': 'right'});
 	equals( jQuery('#floatTest').css('float'), 'right', 'Modified CSS float using "float": Assert float is right');
 	jQuery('#floatTest').css({'font-size': '30px'});
@@ -65,7 +61,7 @@ test("css(String|Hash)", function() {
 });
 
 test("css(String, Object)", function() {
-	expect(21);
+	expect(19);
 	ok( jQuery('#nothiddendiv').is(':visible'), 'Modifying CSS display: Assert element is visible');
 	jQuery('#nothiddendiv').css("display", 'none');
 	ok( !jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is hidden');
@@ -75,10 +71,6 @@ test("css(String, Object)", function() {
 	jQuery("#nothiddendiv").css("top", "-1em");
 	ok( jQuery("#nothiddendiv").css("top"), -16, "Check negative number in EMs." );
 
-	jQuery('#floatTest').css('styleFloat', 'left');
-	equals( jQuery('#floatTest').css('styleFloat'), 'left', 'Modified CSS float using "styleFloat": Assert float is left');
-	jQuery('#floatTest').css('cssFloat', 'right');
-	equals( jQuery('#floatTest').css('cssFloat'), 'right', 'Modified CSS float using "cssFloat": Assert float is right');
 	jQuery('#floatTest').css('float', 'left');
 	equals( jQuery('#floatTest').css('float'), 'left', 'Modified CSS float using "float": Assert float is left');
 	jQuery('#floatTest').css('font-size', '20px');
diff --git a/test/unit/effects.js b/test/unit/effects.js
index 919e3ea4c..5ac471157 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -240,11 +240,11 @@ test("stop()", function() {
 	$foo.animate({ width:'show' }, 1000);
 	setTimeout(function(){
 		var nw = $foo.width();
-		ok( nw != w, "An animation occurred " + nw + "px " + w + "px");
+		notEqual( nw, w, "An animation occurred " + nw + "px " + w + "px");
 		$foo.stop();
 
 		nw = $foo.width();
-		ok( nw != w, "Stop didn't reset the animation " + nw + "px " + w + "px");
+		notEqual( nw, w, "Stop didn't reset the animation " + nw + "px " + w + "px");
 		setTimeout(function(){
 			equals( nw, $foo.width(), "The animation didn't continue" );
 			start();
@@ -266,13 +266,12 @@ test("stop() - several in queue", function() {
 	setTimeout(function(){
 		equals( $foo.queue().length, 3, "All 3 still in the queue" );
 		var nw = $foo.width();
-		ok( nw != w, "An animation occurred " + nw + "px " + w + "px");
+		notEqual( nw, w, "An animation occurred " + nw + "px " + w + "px");
 		$foo.stop();
 
 		nw = $foo.width();
-		ok( nw != w, "Stop didn't reset the animation " + nw + "px " + w + "px");
-		// Disabled, being flaky
-		//equals( $foo.queue().length, 1, "The next animation continued" );
+		notEqual( nw, w, "Stop didn't reset the animation " + nw + "px " + w + "px");
+
 		$foo.stop(true);
 		start();
 	}, 100);
@@ -390,16 +389,16 @@ jQuery.each( {
 	"CSS Auto": function(elem,prop){
 		jQuery(elem).addClass("auto" + prop)
 			.text("This is a long string of text.");
-		return "";
+		return prop == "opacity" ? 1 : "";
 	},
 	"JS Auto": function(elem,prop){
 		jQuery(elem).css(prop,"auto")
 			.text("This is a long string of text.");
-		return "";
+		return prop == "opacity" ? 1 : "";
 	},
 	"CSS 100": function(elem,prop){
 		jQuery(elem).addClass("large" + prop);
-		return "";
+		return prop == "opacity" ? 1 : "";
 	},
 	"JS 100": function(elem,prop){
 		jQuery(elem).css(prop,prop == "opacity" ? 1 : "100px");
@@ -407,7 +406,7 @@ jQuery.each( {
 	},
 	"CSS 50": function(elem,prop){
 		jQuery(elem).addClass("med" + prop);
-		return "";
+		return prop == "opacity" ? 0.5 : "";
 	},
 	"JS 50": function(elem,prop){
 		jQuery(elem).css(prop,prop == "opacity" ? 0.50 : "50px");
@@ -415,7 +414,7 @@ jQuery.each( {
 	},
 	"CSS 0": function(elem,prop){
 		jQuery(elem).addClass("no" + prop);
-		return "";
+		return prop == "opacity" ? 0 : "";
 	},
 	"JS 0": function(elem,prop){
 		jQuery(elem).css(prop,prop == "opacity" ? 0 : "0px");
@@ -475,15 +474,18 @@ jQuery.each( {
 					equals( this.style.display, "block", "Showing, display should block: " + this.style.display);
 					
 				if ( t_w == "hide"||t_w == "show" )
-					equals(this.style.width.indexOf(f_w), 0, "Width must be reset to " + f_w + ": " + this.style.width);
+					ok(f_w === "" ? this.style.width === f_w : this.style.width.indexOf(f_w) === 0, "Width must be reset to " + f_w + ": " + this.style.width);
 					
 				if ( t_h == "hide"||t_h == "show" )
-					equals(this.style.height.indexOf(f_h), 0, "Height must be reset to " + f_h + ": " + this.style.height);
+					ok(f_h === "" ? this.style.height === f_h : this.style.height.indexOf(f_h) === 0, "Height must be reset to " + f_h + ": " + this.style.height);
 					
 				var cur_o = jQuery.style(this, "opacity");
-				if ( cur_o !== "" ) cur_o = parseFloat( cur_o );
+
+				if ( cur_o !== "" ) {
+					cur_o = jQuery.css(this, "opacity");
+				}
 	
-				if ( t_o == "hide"||t_o == "show" )
+				if ( t_o == "hide" || t_o == "show" )
 					equals(cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o);
 					
 				if ( t_w == "hide" )
@@ -492,7 +494,7 @@ jQuery.each( {
 				if ( t_o.constructor == Number ) {
 					equals(cur_o, t_o, "Final opacity should be " + t_o + ": " + cur_o);
 					
-					ok(jQuery.curCSS(this, "opacity") != "" || cur_o == t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o);
+					ok(jQuery.css(this, "opacity") != "" || cur_o == t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o);
 				}
 					
 				if ( t_w.constructor == Number ) {
@@ -512,9 +514,9 @@ jQuery.each( {
 				}
 				
 				if ( t_h == "show" ) {
-					var old_h = jQuery.curCSS(this, "height");
-					jQuery(elem).append("<br/>Some more text<br/>and some more...");
-					ok(old_h != jQuery.css(this, "height" ), "Make sure height is auto.");
+					var old_h = jQuery.css(this, "height");
+					jQuery(this).append("<br/>Some more text<br/>and some more...");
+					notEqual(jQuery.css(this, "height") + "px", old_h, "Make sure height is auto.");
 				}
 	
 				start();
@@ -532,7 +534,7 @@ jQuery.fn.saveState = function(){
 		var self = this;
 		self.save = {};
 		jQuery.each(check, function(i,c){
-			self.save[c] = jQuery.css(self,c);
+			self.save[c] = self.style[ c ] || jQuery.css(self,c);
 		});
 	});
 };
@@ -540,8 +542,8 @@ jQuery.fn.saveState = function(){
 jQuery.checkState = function(){
 	var self = this;
 	jQuery.each(this.save, function(c,v){
-		var cur = jQuery.css(self,c);
-		equals( v, cur, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")");
+		var cur = self.style[ c ] || jQuery.css(self, c);
+		equals( cur, v, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")");
 	});
 	start();
 }