diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-06-02 14:06:54 +0200 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-06-02 14:06:54 +0200 |
| commit | afe0f72945170879571ebaf060a816b39c9871b8 (patch) | |
| tree | 8892e33dc624fe920c9d2838cac0d82b34e04882 /ui/jquery.effects.blind.js | |
| parent | cfaddbfb2a49fbd7f511d49f6404c7447469c5b0 (diff) | |
| parent | 27a4fdd8ed4fe7733ea139022c04bd7ef8033cba (diff) | |
| download | jquery-ui-afe0f72945170879571ebaf060a816b39c9871b8.tar.gz jquery-ui-afe0f72945170879571ebaf060a816b39c9871b8.zip | |
Merge branch 'master' into widget-factory-demo
Diffstat (limited to 'ui/jquery.effects.blind.js')
| -rw-r--r-- | ui/jquery.effects.blind.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ui/jquery.effects.blind.js b/ui/jquery.effects.blind.js index 7a59d8a75..8ef544faa 100644 --- a/ui/jquery.effects.blind.js +++ b/ui/jquery.effects.blind.js @@ -31,7 +31,12 @@ $.effects.effect.blind = function( o ) { animation = {}, wrapper, distance; - $.effects.save( el, props ); + // if already wrapped, the wrapper's properties are my property. #6245 + if ( el.parent().is( ".ui-effects-wrapper" ) ) { + $.effects.save( el.parent(), props ); + } else { + $.effects.save( el, props ); + } el.show(); wrapper = $.effects.createWrapper( el ).css({ overflow: "hidden" |