Skip to content

Commit

Permalink
Fix failing tests, add support for empty spans in Opera. Supplements …
Browse files Browse the repository at this point in the history
…#13132, #10406.
  • Loading branch information
timmywil committed Jan 21, 2013
1 parent 3015ee0 commit bb1d148
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 26 deletions.
5 changes: 4 additions & 1 deletion src/css.js
Expand Up @@ -630,7 +630,10 @@ jQuery(function() {

if ( jQuery.expr && jQuery.expr.filters ) {
jQuery.expr.filters.hidden = function( elem ) {
return elem.offsetWidth === 0 || elem.offsetHeight === 0 || (!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
// Support: Opera <= 12.12
// Opera reports offsetWidths and offsetHeights less than zero on some elements
return elem.offsetWidth <= 0 || elem.offsetHeight <= 0 ||
(!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
};

jQuery.expr.filters.visible = function( elem ) {
Expand Down
2 changes: 1 addition & 1 deletion test/index.html
Expand Up @@ -87,7 +87,7 @@
<!-- Test HTML -->
<!-- this iframe is outside the #qunit-fixture so it won't reload constantly wasting time, but it means the tests must be "safe" and clean up after themselves -->
<iframe id="loadediframe" name="loadediframe" style="display:none;" src="data/iframe.html"></iframe>
<dl id="dl" style="position:absolute;top:-32767px;left:-32767px;width:1px">
<dl id="dl" style="position:absolute;top:-32767px;left:-32767px;width:1px;height:1px">
<div id="qunit-fixture">
<p id="firstp">See <a id="simon1" href="http://simon.incutio.com/archive/2003/03/25/#getElementsBySelector" rel="bookmark">this blog entry</a> for more information.</p>
<p id="ap">
Expand Down
6 changes: 5 additions & 1 deletion test/unit/css.js
Expand Up @@ -897,7 +897,7 @@ test( "css opacity consistency across browsers (#12685)", function() {
});

test( ":visible/:hidden selectors", function() {
expect( 13 );
expect( 16 );

ok( jQuery("#nothiddendiv").is(":visible"), "Modifying CSS display: Assert element is visible" );
jQuery("#nothiddendiv").css({ display: "none" });
Expand All @@ -924,6 +924,10 @@ test( ":visible/:hidden selectors", function() {
equal(jQuery("#table td:visible").length, 1, "hidden cell is not perceived as visible (#4512). Works on table elements");
$table.css("display", "none").html("<tr><td>cell</td><td>cell</td></tr>");
equal(jQuery("#table td:visible").length, 0, "hidden cell children not perceived as visible (#4512)");

t( "Is Visible", "#qunit-fixture div:visible:lt(2)", ["foo", "nothiddendiv"] );
t( "Is Not Hidden", "#qunit-fixture:hidden", [] );
t( "Is Hidden", "#form input:hidden", ["hidden1","hidden2"] );
});

asyncTest( "Clearing a Cloned Element's Style Shouldn't Clear the Original Element's Style (#8908)", 24, function() {
Expand Down
23 changes: 0 additions & 23 deletions test/unit/selector.js
Expand Up @@ -63,29 +63,6 @@ test("attributes - jQuery only", function() {
);
});

if ( jQuery.css ) {
test("pseudo - visibility", function() {
expect( 9 );

t( "Is Visible", "#qunit-fixture div:visible:lt(2)", ["foo", "nothiddendiv"] );
t( "Is Not Hidden", "#qunit-fixture:hidden", [] );
t( "Is Hidden", "#form input:hidden", ["hidden1","hidden2"] );

var $div = jQuery("<div/>").appendTo("body");
$div.css({ fontSize: 0, lineHeight: 0 });// IE also needs to set font-size and line-height to 0
$div.css( "width", 1 ).css( "height", 0 );
t( "Is Visible", "#nothiddendivchild:visible", ["nothiddendivchild"] );
t( "Is Not Visible", "#nothiddendivchild:hidden", [] );
$div.css( "width", 0 ).css( "height", 1 );
t( "Is Visible", "#nothiddendivchild:visible", ["nothiddendivchild"] );
t( "Is Not Visible", "#nothiddendivchild:hidden", [] );
$div.css( "width", 1 ).css( "height", 1 );
t( "Is Visible", "#nothiddendivchild:visible", ["nothiddendivchild"] );
t( "Is Not Visible", "#nothiddendivchild:hidden", [] );
$div.remove();
});
}

test("disconnected nodes", function() {
expect( 4 );
var $opt = jQuery("<option></option>").attr("value", "whipit").appendTo("#qunit-fixture").detach();
Expand Down

0 comments on commit bb1d148

Please sign in to comment.