From bb1d1483451a0be8e16a0169ffccfa719aead1b1 Mon Sep 17 00:00:00 2001
From: Timmy Willison <timmywillisn@gmail.com>
Date: Mon, 21 Jan 2013 18:12:16 -0500
Subject: [PATCH] Fix failing tests, add support for empty spans in Opera.
 Supplements #13132, #10406.

---
 src/css.js            |  5 ++++-
 test/index.html       |  2 +-
 test/unit/css.js      |  6 +++++-
 test/unit/selector.js | 23 -----------------------
 4 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/src/css.js b/src/css.js
index 72b13151b..197cc5722 100644
--- a/src/css.js
+++ b/src/css.js
@@ -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 ) {
diff --git a/test/index.html b/test/index.html
index 45204e27e..9f8edfe20 100644
--- a/test/index.html
+++ b/test/index.html
@@ -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">
diff --git a/test/unit/css.js b/test/unit/css.js
index 101eac032..1a3daab84 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -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" });
@@ -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() {
diff --git a/test/unit/selector.js b/test/unit/selector.js
index 21113207c..07e563da3 100644
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -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();
-- 
2.39.5