X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=test%2Funit%2Feffects.js;h=2dfe834b25778a964ab56326404a281b55f7e400;hp=cb07f6a20c098bcfc03f6d1b5355707b9aa32e16;hb=5646a4feee87b086fa4752373422622d54a8430d;hpb=2bda99c18a0372eed02472e9d318676e180281da
diff --git a/test/unit/effects.js b/test/unit/effects.js
index cb07f6a..2dfe834 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -1,5 +1,10 @@
module("effects");
+test("sanity check", function() {
+ expect(1);
+ ok( jQuery("#dl:visible, #main:visible, #foo:visible").length === 3, "QUnit state is correct for testing effects" );
+});
+
test("show()", function() {
expect(23);
var pass = true, div = jQuery("#main div");
@@ -32,9 +37,11 @@ test("show()", function() {
ok( pass, "Show with " + name + " does not call animate callback" );
});
- jQuery("#main").append('');
-
- var old = jQuery("#show-tests table").show().css("display") !== "table";
+ // #show-tests * is set display: none in CSS
+ jQuery("#main").append('');
+
+ var old = jQuery("#test-table").show().css("display") !== "table";
+ jQuery("#test-table").remove();
var test = {
"div" : "block",
@@ -64,10 +71,12 @@ test("show(Number) - other displays", function() {
QUnit.reset();
stop();
- jQuery("#main").append('');
+ // #show-tests * is set display: none in CSS
+ jQuery("#main").append('');
- var old = jQuery("#show-tests table").show().css("display") !== "table",
+ var old = jQuery("#test-table").show().css("display") !== "table",
num = 0;
+ jQuery("#test-table").remove();
var test = {
"div" : "block",
@@ -116,6 +125,104 @@ test("animate negative height", function() {
});
});
+test("animate block as inline width/height", function() {
+ expect(3);
+ stop();
+ jQuery("#foo").css({ display: "inline", width: '', height: '' }).animate({ width: 42, height: 42 }, 100, function() {
+ equals( jQuery(this).css("display"), jQuery.support.inlineBlockNeedsLayout ? "inline" : "inline-block", "inline-block was set on non-floated inline element when animating width/height" );
+ equals( this.offsetWidth, 42, "width was animated" );
+ equals( this.offsetHeight, 42, "height was animated" );
+ start();
+ });
+});
+
+test("animate native inline width/height", function() {
+ expect(3);
+ stop();
+ jQuery("#foo").css({ display: "", width: '', height: '' })
+ .append('text')
+ .children('span')
+ .animate({ width: 42, height: 42 }, 100, function() {
+ equals( jQuery(this).css("display"), "inline-block", "inline-block was set on non-floated inline element when animating width/height" );
+ equals( this.offsetWidth, 42, "width was animated" );
+ equals( this.offsetHeight, 42, "height was animated" );
+ start();
+ });
+});
+
+test("animate block width/height", function() {
+ expect(3);
+ stop();
+ jQuery("#foo").css({ display: "block", width: 20, height: 20 }).animate({ width: 42, height: 42 }, 100, function() {
+ equals( jQuery(this).css("display"), "block", "inline-block was not set on block element when animating width/height" );
+ equals( this.offsetWidth, 42, "width was animated" );
+ equals( this.offsetHeight, 42, "height was animated" );
+ start();
+ });
+});
+
+test("animate table width/height", function() {
+ expect(1);
+ stop();
+
+ var displayMode = jQuery("#table").css("display") !== "table" ? "block" : "table";
+
+ jQuery("#table").animate({ width: 42, height: 42 }, 100, function() {
+ equals( jQuery(this).css("display"), displayMode, "display mode is correct" );
+ start();
+ });
+});
+
+test("animate table-row width/height", function() {
+ expect(3);
+ stop();
+ var tr = jQuery("#table")
+ .attr({ "cellspacing": 0, "cellpadding": 0, "border": 0 })
+ .html(" |
")
+ .find("tr");
+
+ // IE<8 uses âblockâ instead of the correct display type
+ var displayMode = tr.css("display") !== "table-row" ? "block" : "table-row";
+
+ tr.animate({ width: 10, height: 10 }, 100, function() {
+ equals( jQuery(this).css("display"), displayMode, "display mode is correct" );
+ equals( this.offsetWidth, 20, "width animated to shrink wrap point" );
+ equals( this.offsetHeight, 20, "height animated to shrink wrap point" );
+ start();
+ });
+});
+
+test("animate table-cell width/height", function() {
+ expect(3);
+ stop();
+ var td = jQuery("#table")
+ .attr({ "cellspacing": 0, "cellpadding": 0, "border": 0 })
+ .html(" |
")
+ .find("td");
+
+ // IE<8 uses âblockâ instead of the correct display type
+ var displayMode = td.css("display") !== "table-cell" ? "block" : "table-cell";
+
+ td.animate({ width: 10, height: 10 }, 100, function() {
+ equals( jQuery(this).css("display"), displayMode, "display mode is correct" );
+ equals( this.offsetWidth, 20, "width animated to shrink wrap point" );
+ equals( this.offsetHeight, 20, "height animated to shrink wrap point" );
+ start();
+ });
+});
+
+test("animate resets overflow-x and overflow-y when finished", function() {
+ expect(2);
+ stop();
+ jQuery("#foo")
+ .css({ display: "block", width: 20, height: 20, overflowX: "visible", overflowY: "auto" })
+ .animate({ width: 42, height: 42 }, 100, function() {
+ equals( this.style.overflowX, "visible", "overflow-x is visible" );
+ equals( this.style.overflowY, "auto", "overflow-y is auto" );
+ start();
+ });
+});
+
/* // This test ends up being flaky depending upon the CPU load
test("animate option (queue === false)", function () {
expect(1);
@@ -139,7 +246,7 @@ test("animate option (queue === false)", function () {
test("animate with no properties", function() {
expect(2);
-
+
var divs = jQuery("div"), count = 0;
divs.animate({}, function(){
@@ -161,30 +268,30 @@ test("animate with no properties", function() {
test("animate duration 0", function() {
expect(11);
-
+
stop();
-
+
var $elems = jQuery([{ a:0 },{ a:0 }]), counter = 0;
-
+
equals( jQuery.timers.length, 0, "Make sure no animation was running from another test" );
-
+
$elems.eq(0).animate( {a:1}, 0, function(){
ok( true, "Animate a simple property." );
counter++;
});
-
+
// Failed until [6115]
equals( jQuery.timers.length, 0, "Make sure synchronic animations are not left on jQuery.timers" );
-
+
equals( counter, 1, "One synchronic animations" );
-
+
$elems.animate( { a:2 }, 0, function(){
ok( true, "Animate a second simple property." );
counter++;
});
-
+
equals( counter, 3, "Multiple synchronic animations" );
-
+
$elems.eq(0).animate( {a:3}, 0, function(){
ok( true, "Animate a third simple property." );
counter++;
@@ -195,12 +302,12 @@ test("animate duration 0", function() {
equals( counter, 5, "One synchronic and one asynchronic" );
start();
});
-
+
var $elem = jQuery("");
- $elem.show(0, function(){
+ $elem.show(0, function(){
ok(true, "Show callback with no duration");
});
- $elem.hide(0, function(){
+ $elem.hide(0, function(){
ok(true, "Hide callback with no duration");
});
});
@@ -240,11 +347,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 +373,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);
@@ -343,7 +449,7 @@ test("toggle()", function() {
ok( x.is(":hidden"), "is hidden" );
x.toggle();
ok( x.is(":visible"), "is visible again" );
-
+
x.toggle(true);
ok( x.is(":visible"), "is visible" );
x.toggle(false);
@@ -373,7 +479,7 @@ test("JS Overflow and Display", function() {
.after("text after")
.animate({ opacity: 0.5 }, "slow", jQuery.checkOverflowDisplay);
});
-
+
test("CSS Overflow and Display", function() {
expect(2);
stop();
@@ -390,16 +496,16 @@ jQuery.each( {
"CSS Auto": function(elem,prop){
jQuery(elem).addClass("auto" + prop)
.text("This is a long string of text.");
- return prop == "opacity" ? 1 : "";
+ return "";
},
"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 : "";
+ return "";
},
"CSS 100": function(elem,prop){
jQuery(elem).addClass("large" + prop);
- return prop == "opacity" ? 1 : "";
+ return "";
},
"JS 100": function(elem,prop){
jQuery(elem).css(prop,prop == "opacity" ? 1 : "100px");
@@ -407,7 +513,7 @@ jQuery.each( {
},
"CSS 50": function(elem,prop){
jQuery(elem).addClass("med" + prop);
- return prop == "opacity" ? 0.5 : "";
+ return "";
},
"JS 50": function(elem,prop){
jQuery(elem).css(prop,prop == "opacity" ? 0.50 : "50px");
@@ -415,7 +521,7 @@ jQuery.each( {
},
"CSS 0": function(elem,prop){
jQuery(elem).addClass("no" + prop);
- return prop == "opacity" ? 0 : "";
+ return "";
},
"JS 0": function(elem,prop){
jQuery(elem).css(prop,prop == "opacity" ? 0 : "0px");
@@ -445,16 +551,16 @@ jQuery.each( {
}, function(tn, t){
test(fn + " to " + tn, function() {
var elem = jQuery.makeTest( fn + " to " + tn );
-
+
var t_w = t( elem, "width" );
var f_w = f( elem, "width" );
var t_h = t( elem, "height" );
var f_h = f( elem, "height" );
var t_o = t( elem, "opacity" );
var f_o = f( elem, "opacity" );
-
+
var num = 0;
-
+
if ( t_h == "show" ) num++;
if ( t_w == "show" ) num++;
if ( t_w == "hide"||t_w == "show" ) num++;
@@ -464,75 +570,79 @@ jQuery.each( {
if ( t_o.constructor == Number ) num += 2;
if ( t_w.constructor == Number ) num += 2;
if ( t_h.constructor == Number ) num +=2;
-
+
expect(num);
stop();
-
+
var anim = { width: t_w, height: t_h, opacity: t_o };
-
+
elem.animate(anim, 50, function(){
if ( t_w == "show" )
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);
-
- var cur_o = jQuery.css(this, "opacity");
- if ( cur_o !== "" ) cur_o = parseFloat( cur_o );
-
- if ( t_o == "hide"||t_o == "show" )
+ 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 ( t_o == "hide" || t_o == "show" )
equals(cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o);
-
+
if ( t_w == "hide" )
equals(this.style.display, "none", "Hiding, display should be none: " + this.style.display);
-
+
if ( t_o.constructor == Number ) {
equals(cur_o, t_o, "Final opacity should be " + t_o + ": " + 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 ) {
equals(this.style.width, t_w + "px", "Final width should be " + t_w + ": " + this.style.width);
-
+
var cur_w = jQuery.css(this,"width");
ok(this.style.width != "" || cur_w == t_w, "Width should be explicitly set to " + t_w + ", is instead: " + cur_w);
}
-
+
if ( t_h.constructor == Number ) {
equals(this.style.height, t_h + "px", "Final height should be " + t_h + ": " + this.style.height);
-
+
var cur_h = jQuery.css(this,"height");
ok(this.style.height != "" || cur_h == t_h, "Height should be explicitly set to " + t_h + ", is instead: " + cur_w);
}
-
+
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. " + n);
+
+ 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();
});
});
});
});
-jQuery.fn.saveState = function(){
- var check = ['opacity','height','width','display','overflow'];
+jQuery.fn.saveState = function(hiddenOverflow){
+ var check = ['opacity','height','width','display','overflow'];
expect(check.length);
-
+
stop();
return this.each(function(){
var self = this;
self.save = {};
jQuery.each(check, function(i,c){
- self.save[c] = jQuery.css(self,c);
+ self.save[c] = c === "overflow" && hiddenOverflow ? "hidden" : self.style[ c ] || jQuery.css(self,c);
});
});
};
@@ -540,8 +650,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();
}
@@ -555,31 +665,43 @@ test("Chain fadeIn fadeOut", function() {
});
test("Chain hide show", function() {
- jQuery('#show div').saveState().hide('fast').show('fast',jQuery.checkState);
+ jQuery('#show div').saveState(jQuery.support.shrinkWrapBlocks).hide('fast').show('fast',jQuery.checkState);
});
test("Chain show hide", function() {
- jQuery('#hide div').saveState().show('fast').hide('fast',jQuery.checkState);
+ jQuery('#hide div').saveState(jQuery.support.shrinkWrapBlocks).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);
+ jQuery('#togglein div').saveState(jQuery.support.shrinkWrapBlocks).toggle('fast').toggle('fast',jQuery.checkState);
});
test("Chain toggle out", function() {
- jQuery('#toggleout div').saveState().toggle('fast').toggle('fast',jQuery.checkState);
+ jQuery('#toggleout div').saveState(jQuery.support.shrinkWrapBlocks).toggle('fast').toggle('fast',jQuery.checkState);
+});
+test("Chain toggle out with easing and callback", function() {
+ jQuery('#toggleout div').saveState(jQuery.support.shrinkWrapBlocks).toggle('fast').toggle('fast','linear',jQuery.checkState);
});
-
test("Chain slideDown slideUp", function() {
- jQuery('#slidedown div').saveState().slideDown('fast').slideUp('fast',jQuery.checkState);
+ jQuery('#slidedown div').saveState(jQuery.support.shrinkWrapBlocks).slideDown('fast').slideUp('fast',jQuery.checkState);
});
test("Chain slideUp slideDown", function() {
- jQuery('#slideup div').saveState().slideUp('fast').slideDown('fast',jQuery.checkState);
+ jQuery('#slideup div').saveState(jQuery.support.shrinkWrapBlocks).slideUp('fast').slideDown('fast',jQuery.checkState);
+});
+test("Chain slideUp slideDown with easing and callback", function() {
+ jQuery('#slideup div').saveState(jQuery.support.shrinkWrapBlocks).slideUp('fast').slideDown('fast','linear',jQuery.checkState);
});
test("Chain slideToggle in", function() {
- jQuery('#slidetogglein div').saveState().slideToggle('fast').slideToggle('fast',jQuery.checkState);
+ jQuery('#slidetogglein div').saveState(jQuery.support.shrinkWrapBlocks).slideToggle('fast').slideToggle('fast',jQuery.checkState);
});
test("Chain slideToggle out", function() {
- jQuery('#slidetoggleout div').saveState().slideToggle('fast').slideToggle('fast',jQuery.checkState);
+ jQuery('#slidetoggleout div').saveState(jQuery.support.shrinkWrapBlocks).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 ){
@@ -616,26 +738,26 @@ test("jQuery.show('fast') doesn't clear radio buttons (bug #1095)", function ()
});
test("animate with per-property easing", function(){
-
+
expect(3);
stop();
-
+
var _test1_called = false;
var _test2_called = false;
var _default_test_called = false;
-
+
jQuery.easing['_test1'] = function() {
_test1_called = true;
};
-
+
jQuery.easing['_test2'] = function() {
_test2_called = true;
};
-
+
jQuery.easing['_default_test'] = function() {
_default_test_called = true;
};
-
+
jQuery({a:0,b:0,c:0}).animate({
a: [100, '_test1'],
b: [100, '_test2'],
@@ -646,5 +768,35 @@ test("animate with per-property easing", function(){
ok(_test2_called, "Easing function (2) called");
ok(_default_test_called, "Easing function (_default) called");
});
+
+});
+
+test("hide hidden elements (bug #7141)", function() {
+ expect(3);
+ QUnit.reset();
+
+ var div = jQuery("").appendTo("#main");
+ equals( div.css("display"), "none", "Element is hidden by default" );
+ div.hide();
+ ok( !div.data("olddisplay"), "olddisplay is undefined after hiding an already-hidden element" );
+ div.show();
+ equals( div.css("display"), "block", "Show a double-hidden element" );
+
+ div.remove();
+});
+
+test("hide hidden elements, with animation (bug #7141)", function() {
+ expect(3);
+ QUnit.reset();
+ stop();
+ var div = jQuery("").appendTo("#main");
+ equals( div.css("display"), "none", "Element is hidden by default" );
+ div.hide(1, function () {
+ ok( !div.data("olddisplay"), "olddisplay is undefined after hiding an already-hidden element" );
+ div.show(1, function () {
+ equals( div.css("display"), "block", "Show a double-hidden element" );
+ start();
+ });
+ });
});