diff options
author | Richard Worth <rdworth@gmail.com> | 2010-02-03 01:22:02 +0000 |
---|---|---|
committer | Richard Worth <rdworth@gmail.com> | 2010-02-03 01:22:02 +0000 |
commit | ec5e7ad95ba4c6697f3e66ae93ffc86c1152aefb (patch) | |
tree | a62e816355b3f2724e7fe332558359367c3b668d | |
parent | 30578eb0282d56fb71ab2dda6866134b3f3176ba (diff) | |
download | jquery-ui-ec5e7ad95ba4c6697f3e66ae93ffc86c1152aefb.tar.gz jquery-ui-ec5e7ad95ba4c6697f3e66ae93ffc86c1152aefb.zip |
resizable method destroy: put unwrapped original element in wrapper's place instead of at the end of wrapper's parent. Fixes #4940 - resizable('destroy') moves images to end of parent element
-rw-r--r-- | tests/visual/resizable/resizable_ticket_4940.html | 31 | ||||
-rw-r--r-- | ui/jquery.ui.resizable.js | 4 |
2 files changed, 33 insertions, 2 deletions
diff --git a/tests/visual/resizable/resizable_ticket_4940.html b/tests/visual/resizable/resizable_ticket_4940.html new file mode 100644 index 000000000..111ce7e77 --- /dev/null +++ b/tests/visual/resizable/resizable_ticket_4940.html @@ -0,0 +1,31 @@ +<!doctype html> +<html lang="en"> +<head> + <title>Resizable Visual Test : Resizable ticket #4940</title> + <link rel="stylesheet" href="../visual.css" type="text/css" /> + <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" /> + <script type="text/javascript" src="../../../jquery-1.4.1.js"></script> + <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> + <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> + <script type="text/javascript" src="../../../ui/jquery.ui.mouse.js"></script> + <script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script> + <script type="text/javascript"> + $(function() { + $("#resizable").resizable().resizable('destroy'); + }); + </script> +</head> +<body> + +<h1 class="ui-widget-header"><a href="http://dev.jqueryui.com/ticket/4940">#4940 - resizable('destroy') moves images to end of parent element</a></h1> + +before + +<textarea id="resizable"></textarea> + +after + +</div> + +</body> +</html> diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js index e6728674b..3512b49be 100644 --- a/ui/jquery.ui.resizable.js +++ b/ui/jquery.ui.resizable.js @@ -204,7 +204,7 @@ $.widget("ui.resizable", $.ui.mouse, { if (this.elementIsWrapper) { _destroy(this.element); var wrapper = this.element; - wrapper.parent().append( + wrapper.after( this.originalElement.css({ position: wrapper.css('position'), width: wrapper.outerWidth(), @@ -212,7 +212,7 @@ $.widget("ui.resizable", $.ui.mouse, { top: wrapper.css('top'), left: wrapper.css('left') }) - ).end().remove(); + ).remove(); } this.originalElement.css('resize', this.originalResizeStyle); |