git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update $.fn.animate to only keep overflow set to hidden after an animation in IE6...
[jquery.git]
/
src
/
effects.js
diff --git
a/src/effects.js
b/src/effects.js
index
3257ac3
..
bcbc565
100644
(file)
--- a/
src/effects.js
+++ b/
src/effects.js
@@
-36,17
+36,23
@@
jQuery.fn.extend({
return this.animate( genFx("show", 3), speed, easing, callback);
} else {
for ( var i = 0, j = this.length; i < j; i++ ) {
return this.animate( genFx("show", 3), speed, easing, callback);
} else {
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 = "";
+ }
+
// Set elements which have been overridden with display: none
// in a stylesheet to whatever the default browser style is
// for such an element
// 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" ) {
+ if ( jQuery.css( this[i], "display" ) === "none" && this[i].style.display === "" ) {
jQuery.data(this[i], "olddisplay", defaultDisplay(this[i].nodeName));
}
}
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
// to avoid the constant reflow
- for ( i = 0, j = this.length; i < j; i++ ) {
+ for ( i = 0; i < j; i++ ) {
this[i].style.display = jQuery.data(this[i], "olddisplay") || "";
}
this[i].style.display = jQuery.data(this[i], "olddisplay") || "";
}
@@
-59,17
+65,17
@@
jQuery.fn.extend({
return this.animate( genFx("hide", 3), speed, easing, callback);
} else {
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");
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
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;
}
return this;
@@
-115,7
+121,8
@@
jQuery.fn.extend({
// test suite
var opt = jQuery.extend({}, optall), p,
// 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 ) {
self = this;
for ( p in prop ) {
@@
-131,15
+138,18
@@
jQuery.fn.extend({
return opt.complete.call(this);
}
return opt.complete.call(this);
}
- if ( ( p === "height" || p === "width" ) ) {
+ if ( isElement && ( p === "height" || p === "width" ) ) {
// Make sure that nothing sneaks out
// 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
// 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.css( this, "display" ) === "inline" &&
+ jQuery.css( this, "float" ) === "none" ) {
if ( !jQuery.support.inlineBlockNeedsLayout ) {
this.style.display = "inline-block";
} else {
if ( !jQuery.support.inlineBlockNeedsLayout ) {
this.style.display = "inline-block";
} else {
@@
-152,7
+162,6
@@
jQuery.fn.extend({
}
else {
this.style.display = "inline";
}
else {
this.style.display = "inline";
- jQuery.data( this, "oldzoom", this.style.zoom );
this.style.zoom = 1;
}
}
this.style.zoom = 1;
}
}
@@
-399,8
+408,10
@@
jQuery.fx.prototype = {
if ( done ) {
// Reset the overflow
if ( done ) {
// Reset the overflow
- if ( this.options.overflow != null ) {
- this.elem.style.overflow = this.options.overflow;
+ if ( this.options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
+ this.elem.style.overflow = this.options.overflow[0];
+ this.elem.style.overflowX = this.options.overflow[1];
+ this.elem.style.overflowY = this.options.overflow[2];
}
// Hide the element if the "hide" operation was done
}
// Hide the element if the "hide" operation was done
@@
-453,14
+464,14
@@
jQuery.extend( jQuery.fx, {
jQuery.fx.stop();
}
},
jQuery.fx.stop();
}
},
-
+
interval: 13,
interval: 13,
-
+
stop: function() {
clearInterval( timerId );
timerId = null;
},
stop: function() {
clearInterval( timerId );
timerId = null;
},
-
+
speeds: {
slow: 600,
fast: 200,
speeds: {
slow: 600,
fast: 200,