Commit 6e7a4e73 authored by jeresig's avatar jeresig

Calling .hide().show() on a stylesheet-hidden element wasn't bringing it back. Fixes #7331.

parent 6ab402dc
...@@ -28,7 +28,7 @@ jQuery.fn.extend({ ...@@ -28,7 +28,7 @@ jQuery.fn.extend({
// Reset the inline display of this element to learn if it is // Reset the inline display of this element to learn if it is
// being hidden by cascaded rules or not // being hidden by cascaded rules or not
if ( !jQuery.data(elem, "olddisplay") && display === "none" ) { if ( !jQuery.data(elem, "olddisplay") && display === "none" ) {
elem.style.display = ""; display = elem.style.display = "";
} }
// Set elements which have been overridden with display: none // Set elements which have been overridden with display: none
......
...@@ -6,10 +6,18 @@ test("sanity check", function() { ...@@ -6,10 +6,18 @@ test("sanity check", function() {
}); });
test("show()", function() { test("show()", function() {
expect(26); expect(27);
var hiddendiv = jQuery("div.hidden"); var hiddendiv = jQuery("div.hidden");
hiddendiv.hide().show();
equals( hiddendiv.css("display"), "block", "Make sure a pre-hidden div is visible." );
QUnit.reset();
hiddendiv = jQuery("div.hidden");
equal(jQuery.css( hiddendiv[0], "display"), "none", "hiddendiv is display: none"); equal(jQuery.css( hiddendiv[0], "display"), "none", "hiddendiv is display: none");
hiddendiv.css("display", "block"); hiddendiv.css("display", "block");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment