Merge branch 'animate-nonblock' of http://github.com/csnover/jquery into csnover-animate-nonblock
This commit is contained in:
John Resig
commit
b0dcc1746f
7 changed files with 339 additions and 163 deletions
|
|
@ -289,14 +289,9 @@ function getWH( elem, name, extra ) {
|
|||
|
||||
if ( jQuery.expr && jQuery.expr.filters ) {
|
||||
jQuery.expr.filters.hidden = function( elem ) {
|
||||
var width = elem.offsetWidth, height = elem.offsetHeight,
|
||||
skip = elem.nodeName.toLowerCase() === "tr";
|
||||
var width = elem.offsetWidth, height = elem.offsetHeight;
|
||||
|
||||
return width === 0 && height === 0 && !skip ?
|
||||
true :
|
||||
width > 0 && height > 0 && !skip ?
|
||||
false :
|
||||
(elem.style.display || jQuery.css( elem, "display" )) === "none";
|
||||
return (width === 0 && height === 0) || (!jQuery.support.reliableHiddenOffsets && (elem.style.display || jQuery.css( elem, "display" )) === "none");
|
||||
};
|
||||
|
||||
jQuery.expr.filters.visible = function( elem ) {
|
||||
|
|
|
|||
137
src/effects.js
vendored
137
src/effects.js
vendored
|
|
@ -15,43 +15,28 @@ var elemdisplay = {},
|
|||
|
||||
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");
|
||||
for ( var i = 0, j = this.length; i < j; i++ ) {
|
||||
// Reset the inline display of this element to learn if it is
|
||||
// being hidden by cascaded rules or not
|
||||
if ( !jQuery.data(this[i], "olddisplay") && this[i].style.display === "none" ) {
|
||||
this[i].style.display = "";
|
||||
}
|
||||
|
||||
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);
|
||||
// Set elements which have been overridden with display: none
|
||||
// in a stylesheet to whatever the default browser style is
|
||||
// for such an element
|
||||
if ( this[i].style.display === "" && jQuery.css( this[i], "display" ) === "none" ) {
|
||||
jQuery.data(this[i], "olddisplay", defaultDisplay(this[i].nodeName));
|
||||
}
|
||||
}
|
||||
|
||||
// Set the display of the elements in a second loop
|
||||
// Set the display of most 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; i < j; i++ ) {
|
||||
this[i].style.display = jQuery.data(this[i], "olddisplay") || "";
|
||||
}
|
||||
|
||||
return this;
|
||||
|
|
@ -63,17 +48,17 @@ jQuery.fn.extend({
|
|||
return this.animate( genFx("hide", 3), speed, easing, callback);
|
||||
|
||||
} else {
|
||||
for ( var i = 0, l = this.length; i < l; i++ ) {
|
||||
for ( var i = 0, j = this.length; i < j; i++ ) {
|
||||
var old = jQuery.data(this[i], "olddisplay");
|
||||
if ( !old && old !== "none" ) {
|
||||
if ( !old ) {
|
||||
jQuery.data( this[i], "olddisplay", jQuery.css( this[i], "display" ) );
|
||||
}
|
||||
}
|
||||
|
||||
// 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 = "none";
|
||||
for ( i = 0; i < j; i++ ) {
|
||||
this[i].style.display = "none";
|
||||
}
|
||||
|
||||
return this;
|
||||
|
|
@ -115,8 +100,12 @@ 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"),
|
||||
isElement = this.nodeType === 1,
|
||||
hidden = isElement && jQuery(this).is(":hidden"),
|
||||
self = this;
|
||||
|
||||
for ( p in prop ) {
|
||||
|
|
@ -132,12 +121,35 @@ jQuery.fn.extend({
|
|||
return opt.complete.call(this);
|
||||
}
|
||||
|
||||
if ( ( p === "height" || p === "width" ) && this.style ) {
|
||||
// Store display property
|
||||
opt.display = this.style.display;
|
||||
|
||||
if ( isElement && ( p === "height" || p === "width" ) ) {
|
||||
// Make sure that nothing sneaks out
|
||||
opt.overflow = this.style.overflow;
|
||||
// Record all 3 overflow attributes because IE does not
|
||||
// change the overflow attribute when overflowX and
|
||||
// overflowY are set to the same value
|
||||
opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
|
||||
|
||||
// Set display property to inline-block for height/width
|
||||
// animations on inline elements that are having width/height
|
||||
// animated
|
||||
if ( jQuery.css( this, "display" ) === "inline" &&
|
||||
jQuery.css( 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";
|
||||
this.style.zoom = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ( jQuery.isArray( prop[p] ) ) {
|
||||
|
|
@ -303,11 +315,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 +391,12 @@ jQuery.fx.prototype = {
|
|||
}
|
||||
|
||||
if ( done ) {
|
||||
if ( this.options.display != null ) {
|
||||
// Reset the overflow
|
||||
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";
|
||||
}
|
||||
// Reset the overflow
|
||||
if ( this.options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
|
||||
var elem = this.elem, options = this.options;
|
||||
jQuery.each( [ "", "X", "Y" ], function (index, value) {
|
||||
elem.style[ "overflow" + value ] = options.overflow[index];
|
||||
} );
|
||||
}
|
||||
|
||||
// Hide the element if the "hide" operation was done
|
||||
|
|
@ -447,14 +449,14 @@ jQuery.extend( jQuery.fx, {
|
|||
jQuery.fx.stop();
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
interval: 13,
|
||||
|
||||
|
||||
stop: function() {
|
||||
clearInterval( timerId );
|
||||
timerId = null;
|
||||
},
|
||||
|
||||
|
||||
speeds: {
|
||||
slow: 600,
|
||||
fast: 200,
|
||||
|
|
@ -485,4 +487,21 @@ if ( jQuery.expr && jQuery.expr.filters ) {
|
|||
};
|
||||
}
|
||||
|
||||
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 );
|
||||
|
|
|
|||
|
|
@ -65,7 +65,10 @@
|
|||
checkClone: false,
|
||||
scriptEval: false,
|
||||
noCloneEvent: true,
|
||||
boxModel: null
|
||||
boxModel: null,
|
||||
inlineBlockNeedsLayout: false,
|
||||
shrinkWrapBlocks: false,
|
||||
reliableHiddenOffsets: true
|
||||
};
|
||||
|
||||
// Make sure that the options inside disabled selects aren't marked as disabled
|
||||
|
|
@ -117,26 +120,63 @@
|
|||
|
||||
document.body.appendChild( div );
|
||||
jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
|
||||
document.body.removeChild( div ).style.display = 'none';
|
||||
div = null;
|
||||
|
||||
if ( "zoom" in div.style ) {
|
||||
// Check if natively block-level elements act like inline-block
|
||||
// elements when setting their display to 'inline' and giving
|
||||
// them layout
|
||||
// (IE < 8 does this)
|
||||
div.style.display = "inline";
|
||||
div.style.zoom = 1;
|
||||
jQuery.support.inlineBlockNeedsLayout = div.offsetWidth === 2;
|
||||
|
||||
// Check if elements with layout shrink-wrap their children
|
||||
// (IE 6 does this)
|
||||
div.style.display = "";
|
||||
div.innerHTML = "<div style='width:4px;'></div>";
|
||||
jQuery.support.shrinkWrapBlocks = div.offsetWidth !== 2;
|
||||
}
|
||||
|
||||
div.innerHTML = "<table><tr><td style='padding:0;display:none'></td><td>t</td></tr></table>";
|
||||
var tds = div.getElementsByTagName("td");
|
||||
|
||||
// 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
|
||||
// determining if an element has been hidden directly using
|
||||
// display:none (it is still safe to use offsets if a parent element is
|
||||
// hidden; don safety goggles and see bug #4512 for more information).
|
||||
// (only IE 8 fails this test)
|
||||
jQuery.support.reliableHiddenOffsets = tds[0].offsetHeight === 0;
|
||||
|
||||
tds[0].style.display = "";
|
||||
tds[1].style.display = "none";
|
||||
|
||||
// Check if empty table cells still have offsetWidth/Height
|
||||
// (IE < 8 fail this test)
|
||||
jQuery.support.reliableHiddenOffsets = jQuery.support.reliableHiddenOffsets && tds[0].offsetHeight === 0;
|
||||
div.innerHTML = "";
|
||||
|
||||
document.body.removeChild( div ).style.display = "none";
|
||||
div = tds = null;
|
||||
});
|
||||
|
||||
// Technique from Juriy Zaytsev
|
||||
// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
|
||||
var eventSupported = function( eventName ) {
|
||||
var el = document.createElement("div");
|
||||
eventName = "on" + eventName;
|
||||
var eventSupported = function( eventName ) {
|
||||
var el = document.createElement("div");
|
||||
eventName = "on" + eventName;
|
||||
|
||||
var isSupported = (eventName in el);
|
||||
if ( !isSupported ) {
|
||||
el.setAttribute(eventName, "return;");
|
||||
isSupported = typeof el[eventName] === "function";
|
||||
}
|
||||
el = null;
|
||||
var isSupported = (eventName in el);
|
||||
if ( !isSupported ) {
|
||||
el.setAttribute(eventName, "return;");
|
||||
isSupported = typeof el[eventName] === "function";
|
||||
}
|
||||
el = null;
|
||||
|
||||
return isSupported;
|
||||
return isSupported;
|
||||
};
|
||||
|
||||
|
||||
jQuery.support.submitBubbles = eventSupported("submit");
|
||||
jQuery.support.changeBubbles = eventSupported("change");
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue