diff options
author | Michał Gołębiowski <m.goleb@gmail.com> | 2013-09-02 19:21:09 +0200 |
---|---|---|
committer | Michał Gołębiowski <m.goleb@gmail.com> | 2013-09-06 03:40:49 +0200 |
commit | badcd1b6f301e6253405f17759c1270549a34e12 (patch) | |
tree | 85c41bdda0cfcfa7a12b3a4d5bb5022e6a06684d /src/effects.js | |
parent | 9035cab8c8574404c9eaeb795d0d87f4df772d45 (diff) | |
download | jquery-badcd1b6f301e6253405f17759c1270549a34e12.tar.gz jquery-badcd1b6f301e6253405f17759c1270549a34e12.zip |
Fix #10814. Fix #14084. Make support tests lazy and broken out to components.
Diffstat (limited to 'src/effects.js')
-rw-r--r-- | src/effects.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/effects.js b/src/effects.js index e708cb32b..e64bf045a 100644 --- a/src/effects.js +++ b/src/effects.js @@ -3,12 +3,14 @@ define([ "./var/pnum", "./css/var/cssExpand", "./css/var/isHidden", + "./css/defaultDisplay", + "./effects/support", "./effects/Tween", "./queue", "./css", "./deferred", "./traversing" -], function( jQuery, pnum, cssExpand, isHidden, Tween ) { +], function( jQuery, pnum, cssExpand, isHidden, defaultDisplay, support) { var fxNow, timerId, rfxtypes = /^(?:toggle|show|hide)$/, @@ -309,9 +311,8 @@ function defaultPrefilter( elem, props, opts ) { // inline-level elements accept inline-block; // block-level elements need to be inline with layout - if ( !jQuery.support.inlineBlockNeedsLayout || defaultDisplay( elem.nodeName ) === "inline" ) { + if ( !support.inlineBlockNeedsLayout || defaultDisplay( elem.nodeName ) === "inline" ) { style.display = "inline-block"; - } else { style.zoom = 1; } @@ -320,7 +321,7 @@ function defaultPrefilter( elem, props, opts ) { if ( opts.overflow ) { style.overflow = "hidden"; - if ( !jQuery.support.shrinkWrapBlocks ) { + if ( !support.shrinkWrapBlocks() ) { anim.always(function() { style.overflow = opts.overflow[ 0 ]; style.overflowX = opts.overflow[ 1 ]; |