From 13505e5945e5532c3d56424d50ad109c665d205f Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=B6rn=20Zaefferer?= <joern.zaefferer@gmail.com>
Date: Fri, 30 Nov 2012 13:08:56 +0100
Subject: [PATCH] Dialog: Ensure all animations finish and clean up themselve
 when destroying dialog. Fixes #5860 - Dialog: Destroying a dialog during
 animated close leaves .ui-effects-wrapper in DOM.

---
 tests/unit/dialog/dialog.html       | 2 ++
 tests/unit/dialog/dialog_options.js | 9 +++++++++
 ui/jquery.ui.dialog.js              | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html
index 5413e7cc1..cdc846478 100644
--- a/tests/unit/dialog/dialog.html
+++ b/tests/unit/dialog/dialog.html
@@ -23,6 +23,8 @@
 			"ui/jquery.ui.draggable.js",
 			"ui/jquery.ui.resizable.js",
 			"ui/jquery.ui.button.js",
+			"ui/jquery.ui.effect.js",
+			"ui/jquery.ui.effect-clip.js",
 			"ui/jquery.ui.dialog.js"
 		]
 	});
diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js
index f01a1a2a8..fd7d91827 100644
--- a/tests/unit/dialog/dialog_options.js
+++ b/tests/unit/dialog/dialog_options.js
@@ -212,6 +212,15 @@ test("height", function() {
 	el.remove();
 });
 
+asyncTest( "hide, #5860 - don't leave effects wrapper behind", function() {
+	expect( 1 );
+	$( "#dialog1" ).dialog({ hide: "clip" }).dialog( "close" ).dialog( "destroy" );
+	setTimeout(function() {
+		equal( $( ".ui-effects-wrapper" ).length, 0 );
+		start();
+	}, 500);
+});
+
 test("maxHeight", function() {
 	expect(3);
 
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 46fc7adf4..4a8b9964f 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -131,7 +131,7 @@ $.widget("ui.dialog", {
 			// without detaching first, the following becomes really slow
 			.detach();
 
-		this.uiDialog.remove();
+		this.uiDialog.stop( true, true ).remove();
 
 		if ( this.originalTitle ) {
 			this.element.attr( "title", this.originalTitle );
-- 
2.39.5