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:
0cdcef5
)
Update $.fn.animate to restore overflow-x and overflow-y separately. Fixes #7111.
author
Colin Snover
<github.com@zetafleet.com>
Tue, 5 Oct 2010 18:32:07 +0000
(13:32 -0500)
committer
Colin Snover
<github.com@zetafleet.com>
Tue, 5 Oct 2010 18:32:07 +0000
(13:32 -0500)
src/effects.js
patch
|
blob
|
history
diff --git
a/src/effects.js
b/src/effects.js
index
3257ac3
..
e4893d6
100644
(file)
--- a/
src/effects.js
+++ b/
src/effects.js
@@
-133,7
+133,10
@@
jQuery.fn.extend({
if ( ( p === "height" || p === "width" ) ) {
// Make sure that nothing sneaks out
if ( ( 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
// Set display property to inline-block for height/width
// animations on inline elements that are having width/height
@@
-400,7
+403,9
@@
jQuery.fx.prototype = {
if ( done ) {
// Reset the overflow
if ( this.options.overflow != null ) {
if ( done ) {
// Reset the overflow
if ( this.options.overflow != null ) {
- this.elem.style.overflow = this.options.overflow;
+ 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