diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-06-19 14:45:20 +0200 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-06-19 14:45:20 +0200 |
| commit | aa7f8195f8c288dbefcb92064b68cb28064ac64c (patch) | |
| tree | 333cd184f8a830c1b588e3d3d0368c134648a3b6 /ui/jquery.effects.core.js | |
| parent | 391282a9aeb4e5bb6ba6655d7f1d5d125f93155a (diff) | |
| parent | fb210ae1ec16cefb1e4d4dfaf7d55499cac53ab8 (diff) | |
| download | jquery-ui-aa7f8195f8c288dbefcb92064b68cb28064ac64c.tar.gz jquery-ui-aa7f8195f8c288dbefcb92064b68cb28064ac64c.zip | |
Merge branch 'master' into widget-delegation
Diffstat (limited to 'ui/jquery.effects.core.js')
| -rw-r--r-- | ui/jquery.effects.core.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js index 7650aa8f4..00a803360 100644 --- a/ui/jquery.effects.core.js +++ b/ui/jquery.effects.core.js @@ -410,7 +410,12 @@ $.extend( $.effects, { border: "none", margin: 0, padding: 0 - }); + }), + // Store the size in case width/height are defined in % - Fixes #5245 + size = { + width: element.width(), + height: element.height() + }; element.wrap( wrapper ); wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually loose the reference to the wrapped element @@ -438,6 +443,7 @@ $.extend( $.effects, { bottom: "auto" }); } + element.css(size); return wrapper.css( props ).show(); }, |