git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6ab402d
)
Calling .hide().show() on a stylesheet-hidden element wasn't bringing it back. Fixes...
author
jeresig
<jeresig@gmail.com>
Wed, 27 Oct 2010 18:35:26 +0000
(14:35 -0400)
committer
jeresig
<jeresig@gmail.com>
Wed, 27 Oct 2010 18:35:26 +0000
(14:35 -0400)
src/effects.js
patch
|
blob
|
history
test/unit/effects.js
patch
|
blob
|
history
diff --git
a/src/effects.js
b/src/effects.js
index
b73aa72
..
d87ba8f
100644
(file)
--- a/
src/effects.js
+++ b/
src/effects.js
@@
-28,7
+28,7
@@
jQuery.fn.extend({
// Reset the inline display of this element to learn if it is
// being hidden by cascaded rules or not
if ( !jQuery.data(elem, "olddisplay") && display === "none" ) {
// Reset the inline display of this element to learn if it is
// being hidden by cascaded rules or not
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
diff --git
a/test/unit/effects.js
b/test/unit/effects.js
index
0114b0f
..
8facb4f
100644
(file)
--- a/
test/unit/effects.js
+++ b/
test/unit/effects.js
@@
-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");
hiddendiv.css("display", "block");
equal(jQuery.css( hiddendiv[0], "display"), "none", "hiddendiv is display: none");
hiddendiv.css("display", "block");