aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2013-02-26 10:36:03 -0500
committerScott González <scott.gonzalez@gmail.com>2013-02-26 10:36:03 -0500
commit948563b8b55802c6d4c513065f1b78bbdcff104c (patch)
tree2153fb0270b0626c25ddd2f23cf4ea0776317710 /ui
parentd0ad572349beadc99810ecd53a532bf5f261343d (diff)
downloadjquery-ui-948563b8b55802c6d4c513065f1b78bbdcff104c.tar.gz
jquery-ui-948563b8b55802c6d4c513065f1b78bbdcff104c.zip
Effects: Delegate to core show/hide when the element is already in the correct final state. This forces the element to go through the olddisplay tracking and forces styles on elements even if they're hidden via an ancestor. Fixes #9120 - Effects: .hide() inconsistent with core with a hidden parent.
Diffstat (limited to 'ui')
-rw-r--r--ui/jquery.ui.effect.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/jquery.ui.effect.js b/ui/jquery.ui.effect.js
index 97f006ee0..41aeb4819 100644
--- a/ui/jquery.ui.effect.js
+++ b/ui/jquery.ui.effect.js
@@ -1150,9 +1150,10 @@ $.fn.extend({
}
}
- // if the element is hiddden and mode is hide,
- // or element is visible and mode is show
+ // If the element already has the correct final state, delegate to
+ // the core methods so the internal tracking of "olddisplay" works.
if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
+ elem[ mode ]();
done();
} else {
effectMethod.call( elem[0], args, done );