deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make sure that hide or show don't fail when operating on non-Element nodes. Fixes #6135.

Browse source
This commit is contained in:
John Resig 2011-04-17 11:07:42 -07:00
parent 728a70c036
commit 21c0be8496
2 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/effects.js vendored
View file

@ -28,19 +28,22 @@ jQuery.fn.extend({
} else { } else {
for ( var i = 0, j = this.length; i < j; i++ ) { for ( var i = 0, j = this.length; i < j; i++ ) {
elem = this[i]; elem = this[i];
display = elem.style.display;
// Reset the inline display of this element to learn if it is if ( elem.style ) {
// being hidden by cascaded rules or not display = elem.style.display;
if ( !jQuery._data(elem, "olddisplay") && display === "none" ) {
display = elem.style.display = "";
}
// Set elements which have been overridden with display: none // Reset the inline display of this element to learn if it is
// in a stylesheet to whatever the default browser style is // being hidden by cascaded rules or not
// for such an element if ( !jQuery._data(elem, "olddisplay") && display === "none" ) {
if ( display === "" && jQuery.css( elem, "display" ) === "none" ) { display = elem.style.display = "";
jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName)); }
// Set elements which have been overridden with display: none
// in a stylesheet to whatever the default browser style is
// for such an element
if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName));
}
} }
} }
@ -48,10 +51,13 @@ jQuery.fn.extend({
// to avoid the constant reflow // to avoid the constant reflow
for ( i = 0; i < j; i++ ) { for ( i = 0; i < j; i++ ) {
elem = this[i]; elem = this[i];
display = elem.style.display;
if ( display === "" || display === "none" ) { if ( elem.style ) {
elem.style.display = jQuery._data(elem, "olddisplay") || ""; display = elem.style.display;
if ( display === "" || display === "none" ) {
elem.style.display = jQuery._data(elem, "olddisplay") || "";
}
} }
} }
@ -75,7 +81,9 @@ jQuery.fn.extend({
// Set the display of the elements in a second loop // Set the display of the elements in a second loop
// to avoid the constant reflow // to avoid the constant reflow
for ( i = 0; i < j; i++ ) { for ( i = 0; i < j; i++ ) {
this[i].style.display = "none"; if ( this[i].style ) {
this[i].style.display = "none";
}
} }
return this; return this;

4
test/unit/effects.js vendored
View file

@ -88,6 +88,10 @@ test("show()", function() {
var elem = jQuery(selector, "#show-tests").show(); var elem = jQuery(selector, "#show-tests").show();
equals( elem.css("display"), expected, "Show using correct display type for " + selector ); equals( elem.css("display"), expected, "Show using correct display type for " + selector );
}); });
// Make sure that showing or hiding a text node doesn't cause an error
jQuery("<div>test</div> text <span>test</span>").show().remove();
jQuery("<div>test</div> text <span>test</span>").hide().remove();
}); });
test("show(Number) - other displays", function() { test("show(Number) - other displays", function() {