diff options
author | Timmy Willison <timmywillisn@gmail.com> | 2016-01-20 13:20:58 -0500 |
---|---|---|
committer | Timmy Willison <timmywillisn@gmail.com> | 2016-01-21 11:27:39 -0500 |
commit | a6fc0b16511c70472ebb3dd9469d08566969ac88 (patch) | |
tree | 5efd15f7a83651b8f27171b404c3c2bd2f8ec705 /src/effects.js | |
parent | 4d3050b3d80dc58cdcca0ce7bfdd780e50b0483f (diff) | |
download | jquery-a6fc0b16511c70472ebb3dd9469d08566969ac88.tar.gz jquery-a6fc0b16511c70472ebb3dd9469d08566969ac88.zip |
CSS: isHidden -> isHiddenWithinTree
Fixes gh-2404
Close gh-2855
Diffstat (limited to 'src/effects.js')
-rw-r--r-- | src/effects.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/effects.js b/src/effects.js index 43162e1fb..db4b4101c 100644 --- a/src/effects.js +++ b/src/effects.js @@ -4,7 +4,7 @@ define( [ "./var/rcssNum", "./var/rnotwhite", "./css/var/cssExpand", - "./css/var/isHidden", + "./css/var/isHiddenWithinTree", "./css/var/swap", "./css/adjustCSS", "./data/var/dataPriv", @@ -17,7 +17,7 @@ define( [ "./manipulation", "./css", "./effects/Tween" -], function( jQuery, document, rcssNum, rnotwhite, cssExpand, isHidden, swap, +], function( jQuery, document, rcssNum, rnotwhite, cssExpand, isHiddenWithinTree, swap, adjustCSS, dataPriv, showHide ) { var @@ -82,7 +82,7 @@ function defaultPrefilter( elem, props, opts ) { anim = this, orig = {}, style = elem.style, - hidden = elem.nodeType && isHidden( elem ), + hidden = elem.nodeType && isHiddenWithinTree( elem ), dataShow = dataPriv.get( elem, "fxshow" ); // Queue-skipping animations hijack the fx hooks @@ -479,7 +479,7 @@ jQuery.fn.extend( { fadeTo: function( speed, to, easing, callback ) { // Show any hidden elements after setting opacity to 0 - return this.filter( isHidden ).css( "opacity", 0 ).show() + return this.filter( isHiddenWithinTree ).css( "opacity", 0 ).show() // Animate to the value specified .end().animate( { opacity: to }, speed, easing, callback ); |