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

Update $.fn.animate to change display mode only when necessary (inline, non-floated elements), and to use a more proper display mode for those elements. Fixes #2185.

Browse source
This commit is contained in:
Colin Snover 2010-10-05 13:28:43 -05:00
parent 0229b83f7e
commit 0cdcef5b36
6 changed files with 146 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

104
src/effects.js vendored
View file

@ -13,45 +13,41 @@ var elemdisplay = {},
[ "opacity" ]
];
function defaultDisplay(nodeName) {
if ( !elemdisplay[ nodeName ] ) {
var elem = jQuery("<" + nodeName + ">").appendTo("body"),
display = elem.css("display");
elem.remove();
if ( display === "none" || display === "" ) {
display = "block";
}
elemdisplay[ nodeName ] = display;
}
return elemdisplay[ nodeName ];
}
jQuery.fn.extend({
show: function( speed, easing, callback ) {
if ( speed || speed === 0) {
if ( speed || speed === 0 ) {
return this.animate( genFx("show", 3), speed, easing, callback);
} else {
for ( var i = 0, l = this.length; i < l; i++ ) {
var old = jQuery.data(this[i], "olddisplay");
this[i].style.display = old || "";
if ( jQuery.css( this[i], "display" ) === "none" ) {
var nodeName = this[i].nodeName, display;
if ( elemdisplay[ nodeName ] ) {
display = elemdisplay[ nodeName ];
} else {
var elem = jQuery("<" + nodeName + ">").appendTo("body");
display = elem.css("display");
if ( display === "none" ) {
display = "block";
}
elem.remove();
elemdisplay[ nodeName ] = display;
}
jQuery.data(this[i], "olddisplay", display);
for ( var i = 0, j = this.length; i < j; i++ ) {
// Set elements which have been overridden with display: none
// in a stylesheet to whatever the default browser style is
// for such an element
if ( jQuery.css( this[i], "display" ) === "none" && this[i].style.display !== "none" ) {
jQuery.data(this[i], "olddisplay", defaultDisplay(this[i].nodeName));
}
}
// Set the display of the elements in a second loop
// to avoid the constant reflow
for ( var j = 0, k = this.length; j < k; j++ ) {
this[j].style.display = jQuery.data(this[j], "olddisplay") || "";
for ( i = 0, j = this.length; i < j; i++ ) {
this[i].style.display = jQuery.data(this[i], "olddisplay") || "";
}
return this;
@ -115,6 +111,9 @@ jQuery.fn.extend({
}
return this[ optall.queue === false ? "each" : "queue" ](function() {
// XXX ‘this’ does not always have a nodeName when running the
// test suite
var opt = jQuery.extend({}, optall), p,
hidden = this.nodeType === 1 && jQuery(this).is(":hidden"),
self = this;
@ -132,12 +131,32 @@ jQuery.fn.extend({
return opt.complete.call(this);
}
if ( ( p === "height" || p === "width" ) && this.style ) {
// Store display property
opt.display = this.style.display;
if ( ( p === "height" || p === "width" ) ) {
// Make sure that nothing sneaks out
opt.overflow = this.style.overflow;
// Set display property to inline-block for height/width
// animations on inline elements that are having width/height
// animated
if ( jQuery.curCSS( this, "display" ) === "inline" &&
jQuery.curCSS( this, "float" ) === "none" ) {
if ( !jQuery.support.inlineBlockNeedsLayout ) {
this.style.display = "inline-block";
} else {
var display = defaultDisplay(this.nodeName);
// inline-level elements accept inline-block;
// block-level elements need to be inline with layout
if ( display === "inline" ) {
this.style.display = "inline-block";
}
else {
this.style.display = "inline";
jQuery.data( this, "oldzoom", this.style.zoom );
this.style.zoom = 1;
}
}
}
}
if ( jQuery.isArray( prop[p] ) ) {
@ -303,11 +322,6 @@ jQuery.fx.prototype = {
}
(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
// Set display property to block for height/width animations
if ( ( this.prop === "height" || this.prop === "width" ) && this.elem.style ) {
this.elem.style.display = "block";
}
},
// Get the current size
@ -384,17 +398,9 @@ jQuery.fx.prototype = {
}
if ( done ) {
if ( this.options.display != null ) {
// Reset the overflow
// Reset the overflow
if ( this.options.overflow != null ) {
this.elem.style.overflow = this.options.overflow;
// Reset the display
var old = jQuery.data(this.elem, "olddisplay");
this.elem.style.display = old ? old : this.options.display;
if ( jQuery.css( this.elem, "display" ) === "none" ) {
this.elem.style.display = "block";
}
}
// Hide the element if the "hide" operation was done

12
src/support.js
View file

@ -66,6 +66,7 @@
scriptEval: false,
noCloneEvent: true,
boxModel: null,
inlineBlockNeedsLayout: false,
reliableHiddenOffsets: true
};
@ -119,6 +120,17 @@
document.body.appendChild( div );
jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
// Check if natively block-level elements act like inline-block
// elements when setting their display to 'inline'
// (IE < 8 does this)
if ( 'zoom' in div.style ) {
div.style.display = 'inline';
// Layout is necessary to trigger this “feature”
div.style.zoom = 1;
jQuery.support.inlineBlockNeedsLayout = div.offsetWidth === 2;
}
// Check if table cells still have offsetWidth/Height when they are set
// to display:none and there are still other visible table cells in a
// table row; if so, offsetWidth/Height are not reliable for use when