deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't test inline-block in browsers that don't support it (or an approximation of it, like IE).

Browse source
This commit is contained in:
jeresig 2010-10-14 21:48:03 -04:00
parent 2d5f8666ac
commit 40aa95c320
1 changed files with 46 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
test/unit/effects.js vendored
View file

@ -127,27 +127,56 @@ test("animate negative height", function() {
test("animate block as inline width/height", function() { test("animate block as inline width/height", function() {
expect(3); expect(3);
stop();
jQuery("#foo").css({ display: "inline", width: '', height: '' }).animate({ width: 42, height: 42 }, 100, function() { var span = jQuery("<span>").css("display", "inline-block").appendTo("body"),
equals( jQuery(this).css("display"), jQuery.support.inlineBlockNeedsLayout ? "inline" : "inline-block", "inline-block was set on non-floated inline element when animating width/height" ); expected = span.css("display");
equals( this.offsetWidth, 42, "width was animated" );
equals( this.offsetHeight, 42, "height was animated" ); span.remove();
start();
}); if ( jQuery.support.inlineBlockNeedsLayout || expected === "inline-block" ) {
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();
});
// Browser doesn't support inline-block
} else {
ok( true, "Browser doesn't support inline-block" );
ok( true, "Browser doesn't support inline-block" );
ok( true, "Browser doesn't support inline-block" );
}
}); });
test("animate native inline width/height", function() { test("animate native inline width/height", function() {
expect(3); expect(3);
stop();
jQuery("#foo").css({ display: "", width: '', height: '' }) var span = jQuery("<span>").css("display", "inline-block").appendTo("body"),
.append('<span>text</span>') expected = span.css("display");
.children('span')
.animate({ width: 42, height: 42 }, 100, function() { span.remove();
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" ); if ( jQuery.support.inlineBlockNeedsLayout || expected === "inline-block" ) {
equals( this.offsetHeight, 42, "height was animated" ); stop();
start(); jQuery("#foo").css({ display: "", width: '', height: '' })
}); .append('<span>text</span>')
.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();
});
// Browser doesn't support inline-block
} else {
ok( true, "Browser doesn't support inline-block" );
ok( true, "Browser doesn't support inline-block" );
ok( true, "Browser doesn't support inline-block" );
}
}); });
test("animate block width/height", function() { test("animate block width/height", function() {