diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2009-07-13 00:51:03 +0000 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2009-07-13 00:51:03 +0000 |
| commit | 226ff67a002cacb89ffc1bf9c3760eec17b558a9 (patch) | |
| tree | 185dc3ecf5c971a1d11be61b3c59db4bfd57c6e6 /ui | |
| parent | 695adc544d7f15dde52ad13766e6431caa0a654b (diff) | |
| download | jquery-ui-226ff67a002cacb89ffc1bf9c3760eec17b558a9.tar.gz jquery-ui-226ff67a002cacb89ffc1bf9c3760eec17b558a9.zip | |
animateClass: Don't animate scrollbar properties. Fixes #4676 - toggleClass breaks in IE sometimes.
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/effects.core.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/effects.core.js b/ui/effects.core.js index 593ee6586..2cc7542f2 100644 --- a/ui/effects.core.js +++ b/ui/effects.core.js @@ -113,6 +113,7 @@ $.effects = { for(var n in newStyle) { if( typeof newStyle[n] != "function" && newStyle[n] /* No functions and null properties */ && n.indexOf("Moz") == -1 && n.indexOf("length") == -1 /* No mozilla spezific render properties. */ + && n.indexOf("scrollbar") == -1 /* No scrollbar properties - causes problems in IE */ && newStyle[n] != oldStyle[n] /* Only values that have changed are used for the animation */ && (n.match(/color/i) || (!n.match(/color/i) && !isNaN(parseInt(newStyle[n],10)))) /* Only things that can be parsed to integers or colors */ && (oldStyle.position != "static" || (oldStyle.position == "static" && !n.match(/left|top|bottom|right/))) /* No need for positions when dealing with static positions */ @@ -133,6 +134,12 @@ $.effects = { function _normalizeArguments(effect, options, speed, callback) { // shift params for method overloading + if (typeof effect == 'object') { + callback = options; + speed = null; + options = effect; + effect = options.effect; + } if ($.isFunction(options)) { callback = options; speed = null; |