X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Feffects.js;h=ed6faa952808fe21724cb4305f3e5b3bf71580a0;hb=dc4c9abc39ce7eda44ff8878d476db1e57b7bc46;hp=bfd6ff4fc674307ff4596aab06e9b230e6116986;hpb=2131e1a7ad6d9df239ec00b301303e10dbd34d49;p=jquery.git
diff --git a/test/unit/effects.js b/test/unit/effects.js
index bfd6ff4..ed6faa9 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);
@@ -393,7 +392,7 @@ jQuery.each( {
return prop == "opacity" ? 1 : "";
},
"JS Auto": function(elem,prop){
- jQuery(elem).css(prop,"auto")
+ jQuery(elem).css(prop,"")
.text("This is a long string of text.");
return prop == "opacity" ? 1 : "";
},
@@ -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.css(this, "opacity");
- if ( cur_o !== "" ) cur_o = parseFloat( cur_o );
+ var cur_o = jQuery.style(this, "opacity");
+
+ 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" )
@@ -512,9 +514,14 @@ jQuery.each( {
}
if ( t_h == "show" ) {
- var old_h = jQuery.css(this, "height", undefined, true);
+ var old_h = jQuery.css(this, "height");
jQuery(this).append("
Some more text
and some more...");
- notEqual(jQuery.css(this, "height", undefined, true), old_h, "Make sure height is auto.");
+
+ if ( /Auto/.test( fn ) ) {
+ notEqual(jQuery.css(this, "height"), old_h, "Make sure height is auto.");
+ } else {
+ equals(jQuery.css(this, "height"), old_h, "Make sure height is not auto.");
+ }
}
start();
@@ -532,7 +539,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 +547,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();
}
@@ -560,6 +567,9 @@ test("Chain hide show", function() {
test("Chain show hide", function() {
jQuery('#hide div').saveState().show('fast').hide('fast',jQuery.checkState);
});
+test("Chain show hide with easing and callback", function() {
+ jQuery('#hide div').saveState().show('fast').hide('fast','linear',jQuery.checkState);
+});
test("Chain toggle in", function() {
jQuery('#togglein div').saveState().toggle('fast').toggle('fast',jQuery.checkState);
@@ -567,13 +577,18 @@ test("Chain toggle in", function() {
test("Chain toggle out", function() {
jQuery('#toggleout div').saveState().toggle('fast').toggle('fast',jQuery.checkState);
});
-
+test("Chain toggle out with easing and callback", function() {
+ jQuery('#toggleout div').saveState().toggle('fast').toggle('fast','linear',jQuery.checkState);
+});
test("Chain slideDown slideUp", function() {
jQuery('#slidedown div').saveState().slideDown('fast').slideUp('fast',jQuery.checkState);
});
test("Chain slideUp slideDown", function() {
jQuery('#slideup div').saveState().slideUp('fast').slideDown('fast',jQuery.checkState);
});
+test("Chain slideUp slideDown with easing and callback", function() {
+ jQuery('#slideup div').saveState().slideUp('fast').slideDown('fast','linear',jQuery.checkState);
+});
test("Chain slideToggle in", function() {
jQuery('#slidetogglein div').saveState().slideToggle('fast').slideToggle('fast',jQuery.checkState);
@@ -582,6 +597,10 @@ test("Chain slideToggle out", function() {
jQuery('#slidetoggleout div').saveState().slideToggle('fast').slideToggle('fast',jQuery.checkState);
});
+test("Chain fadeTo 0.5 1.0 with easing and callback)", function() {
+ jQuery('#fadeto div').saveState().fadeTo('fast',0.5).fadeTo('fast',1.0,'linear',jQuery.checkState);
+});
+
jQuery.makeTest = function( text ){
var elem = jQuery("")
.attr("id", "test" + jQuery.makeTest.id++)