Merge branch 'master' of github.com:jquery/jquery
This commit is contained in:
commit
8ea634fd07
4 changed files with 40 additions and 15 deletions
28
test/unit/effects.js
vendored
28
test/unit/effects.js
vendored
|
@ -1,18 +1,36 @@
|
|||
module("effects");
|
||||
|
||||
test("show()", function() {
|
||||
expect(16);
|
||||
expect(23);
|
||||
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;
|
||||
var speeds = {
|
||||
"null speed": null,
|
||||
"undefined speed": undefined,
|
||||
"empty string speed": "",
|
||||
"false speed": false
|
||||
};
|
||||
|
||||
jQuery.each(speeds, function(name, speed) {
|
||||
pass = true;
|
||||
div.hide().show(speed).each(function() {
|
||||
if ( this.style.display == "none" ) pass = false;
|
||||
});
|
||||
ok( pass, "Show with " + name);
|
||||
});
|
||||
|
||||
|
||||
jQuery.each(speeds, function(name, speed) {
|
||||
pass = true;
|
||||
div.hide().show(speed, function() {
|
||||
pass = false;
|
||||
});
|
||||
ok( pass, "Show with " + name + " does not call animate callback" );
|
||||
});
|
||||
ok( pass, "Show will null speed");
|
||||
|
||||
jQuery("#main").append('<div id="show-tests"><div><p><a href="#"></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div>');
|
||||
|
||||
|
|
|
@ -305,6 +305,13 @@ testoffset("body", function( jQuery ) {
|
|||
equals( jQuery('body').offset().left, 1, "jQuery('#body').offset().left" );
|
||||
});
|
||||
|
||||
test("Chaining offset(coords) returns jQuery object", function() {
|
||||
expect(2);
|
||||
var coords = { top: 1, left: 1 };
|
||||
equals( jQuery("#absolute-1").offset(coords).selector, "#absolute-1", "offset(coords) returns jQuery object" );
|
||||
equals( jQuery("#non-existent").offset(coords).selector, "#non-existent", "offset(coords) with empty jQuery set returns jQuery object" );
|
||||
});
|
||||
|
||||
test("offsetParent", function(){
|
||||
expect(11);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue