X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Ffx.js;h=b9597993863b391f82f276673282b2eaa779ed47;hb=93fdbeb963a9c350f807818c7cc99982942a92f3;hp=63a3de7a6a350341eced86f611d880169b9a9ce3;hpb=7c04a64016c1f295dfdf4e731f693f8400a987bc;p=jquery.git
diff --git a/test/unit/fx.js b/test/unit/fx.js
index 63a3de7..b959799 100644
--- a/test/unit/fx.js
+++ b/test/unit/fx.js
@@ -1,13 +1,19 @@
module("fx");
test("show()", function() {
- expect(15);
+ expect(16);
var pass = true, div = jQuery("#main div");
div.show().each(function(){
if ( this.style.display == "none" ) pass = false;
});
ok( pass, "Show" );
+ pass = true;
+ div.hide().show(null).each(function() {
+ if ( this.style.display == "none" ) pass = false;
+ });
+ ok( pass, "Show will null speed");
+
jQuery("#main").append('');
var old = jQuery("#show-tests table").show().css("display") !== "table";
@@ -35,6 +41,43 @@ test("show()", function() {
});
});
+test("show(Number) - other displays", function() {
+ expect(15);
+ reset();
+ stop();
+
+ jQuery("#main").append('');
+
+ var old = jQuery("#show-tests table").show().css("display") !== "table",
+ num = 0;
+
+ var test = {
+ "div" : "block",
+ "p" : "block",
+ "a" : "inline",
+ "code" : "inline",
+ "pre" : "block",
+ "span" : "inline",
+ "table" : old ? "block" : "table",
+ "thead" : old ? "block" : "table-header-group",
+ "tbody" : old ? "block" : "table-row-group",
+ "tr" : old ? "block" : "table-row",
+ "th" : old ? "block" : "table-cell",
+ "td" : old ? "block" : "table-cell",
+ "ul" : "block",
+ "li" : old ? "block" : "list-item"
+ };
+
+ jQuery.each(test, function(selector, expected) {
+ var elem = jQuery(selector, "#show-tests").show(1, function() {
+ equals( elem.css("display"), expected, "Show using correct display type for " + selector );
+ if ( ++num === 15 ) {
+ start();
+ }
+ });
+ });
+});
+
test("animate(Hash, Object, Function)", function() {
expect(1);
stop();
@@ -46,6 +89,16 @@ test("animate(Hash, Object, Function)", function() {
});
});
+test("animate negative height", function() {
+ expect(1);
+ stop();
+ jQuery("#foo").animate({ height: -100 }, 100, function() {
+ equals( this.offsetHeight, 0, "Verify height." );
+ start();
+ });
+});
+
+/* // This test ends up being flaky depending upon the CPU load
test("animate option (queue === false)", function () {
expect(1);
stop();
@@ -53,53 +106,87 @@ test("animate option (queue === false)", function () {
var order = [];
var $foo = jQuery("#foo");
- $foo.animate({width:'100px'}, 200, function () {
+ $foo.animate({width:'100px'}, 3000, function () {
// should finish after unqueued animation so second
order.push(2);
+ same( order, [ 1, 2 ], "Animations finished in the correct order" );
+ start();
});
$foo.animate({fontSize:'2em'}, {queue:false, duration:10, complete:function () {
// short duration and out of queue so should finish first
order.push(1);
}});
- $foo.animate({height:'100px'}, 10, function() {
- // queued behind the first animation so should finish third
- order.push(3);
- isSet( order, [ 1, 2, 3], "Animations finished in the correct order" );
- start();
+});
+*/
+
+test("animate with no properties", function() {
+ expect(1);
+
+ var divs = jQuery("div"), count = 0;
+
+ divs.animate({}, function(){
+ count++;
});
+
+ equals( divs.length, count, "Make sure that callback is called for each element in the set." );
});
test("animate duration 0", function() {
- expect(5);
+ expect(11);
stop();
- var $elems = jQuery([{ a:0 },{ a:0 }]),
- counter = 0,
- count = function(){
- counter++;
- };
+ 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, count );
+ $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, count );
+ $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, count );
- $elems.eq(1).animate( {a:3}, 20, function(){
- count();
+ $elems.eq(0).animate( {a:3}, 0, function(){
+ ok( true, "Animate a third simple property." );
+ counter++;
+ });
+ $elems.eq(1).animate( {a:3}, 200, function(){
+ counter++;
// Failed until [6115]
equals( counter, 5, "One synchronic and one asynchronic" );
start();
- });
+ });
+
+ var $elem = jQuery("");
+ $elem.show(0, function(){
+ ok(true, "Show callback with no duration");
+ });
+ $elem.hide(0, function(){
+ ok(true, "Hide callback with no duration");
+ });
+});
+
+test("animate hyphenated properties", function(){
+ expect(1);
+ stop();
+
+ jQuery("#nothiddendiv")
+ .css("font-size", 10)
+ .animate({"font-size": 20}, 200, function(){
+ equals( this.style.fontSize, "20px", "The font-size property was animated." );
+ start();
+ });
});
test("animate non-element", function(){
@@ -365,7 +452,7 @@ jQuery.each( {
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.attr(this.style, "opacity");
+ var cur_o = jQuery.style(this, "opacity");
if ( cur_o !== "" ) cur_o = parseFloat( cur_o );
if ( t_o == "hide"||t_o == "show" )
@@ -484,3 +571,52 @@ jQuery.makeTest = function( text ){
}
jQuery.makeTest.id = 1;
+
+test("jQuery.show('fast') doesn't clear radio buttons (bug #1095)", function () {
+ expect(4);
+ stop();
+
+ var $checkedtest = jQuery("#checkedtest");
+ // IE6 was clearing "checked" in jQuery(elem).show("fast");
+ $checkedtest.hide().show("fast", function() {
+ ok( !! jQuery(":radio:first", $checkedtest).attr("checked"), "Check first radio still checked." );
+ ok( ! jQuery(":radio:last", $checkedtest).attr("checked"), "Check last radio still NOT checked." );
+ ok( !! jQuery(":checkbox:first", $checkedtest).attr("checked"), "Check first checkbox still checked." );
+ ok( ! jQuery(":checkbox:last", $checkedtest).attr("checked"), "Check last checkbox still NOT checked." );
+ start();
+ });
+});
+
+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'],
+ c: 100
+ }, 400, '_default_test', function(){
+ start();
+ ok(_test1_called, "Easing function (1) called");
+ ok(_test2_called, "Easing function (2) called");
+ ok(_default_test_called, "Easing function (_default) called");
+ });
+
+});
\ No newline at end of file