From d1505e3434ef99e0068347a5e8179a0ffd737676 Mon Sep 17 00:00:00 2001
From: Kris Borchers <kris.borchers@gmail.com>
Date: Wed, 30 Jan 2013 12:30:37 -0600
Subject: [PATCH] Dialog: Move call to _focusTabbable and triggering of open
 and focus events into the _show callback. Fixes #6756 - Dialog: show: "blind"
 with link in content doesn't animate properly. Fixes #8051 - Dialog:
 'Explode' dialog animation causes crash in IE 6, 7 and 8. Fixes #4421 -
 Dialog: Focus lost from dialog which uses show-effect

---
 tests/unit/dialog/dialog.html       |  2 ++
 tests/unit/dialog/dialog_options.js | 40 +++++++++++++++++++++++++++++
 ui/jquery.ui.dialog.js              |  9 ++++---
 3 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html
index 57017b1b9..7943b425b 100644
--- a/tests/unit/dialog/dialog.html
+++ b/tests/unit/dialog/dialog.html
@@ -24,7 +24,9 @@
 			"ui/jquery.ui.resizable.js",
 			"ui/jquery.ui.button.js",
 			"ui/jquery.ui.effect.js",
+			"ui/jquery.ui.effect-blind.js",
 			"ui/jquery.ui.effect-clip.js",
+			"ui/jquery.ui.effect-explode.js",
 			"ui/jquery.ui.dialog.js"
 		]
 	});
diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js
index 5f0434308..ecb7e5dd2 100644
--- a/tests/unit/dialog/dialog_options.js
+++ b/tests/unit/dialog/dialog_options.js
@@ -531,4 +531,44 @@ test("#4826: setting resizable false toggles resizable on dialog", function() {
 
 });
 
+asyncTest( "#8051 - 'Explode' dialog animation causes crash in IE 6, 7 and 8", function() {
+	expect( 1 );
+	var el = $( "<div></div>" ).dialog({
+		show: "explode",
+		focus: function() {
+			ok( true, "dialog opened with animation" );
+			el.remove();
+			start();
+		}
+	});
+});
+
+asyncTest( "#4421 - Focus lost from dialog which uses show-effect", function() {
+	expect( 1 );
+	var el = $( "<div></div>" ).dialog({
+		show: "blind",
+		focus: function() {
+			equal( el.dialog( "widget" ).find( ":focus" ).length, 1, "dialog maintains focus" );
+			el.remove();
+			start();
+		}
+	});
+});
+
+asyncTest( "Open followed by close during show effect", function() {
+	expect( 1 );
+	var el = $( "<div></div>" ).dialog({
+		show: "blind",
+		close: function() {
+			ok( true, "dialog closed properly during animation" );
+			el.remove();
+			start();
+		}
+	});
+
+	setTimeout( function() {
+		el.dialog("close");
+	}, 100 );
+});
+
 })(jQuery);
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index ec4032ff3..77bf68dd1 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -207,6 +207,7 @@ $.widget( "ui.dialog", {
 	},
 
 	open: function() {
+		var that = this;
 		if ( this._isOpen ) {
 			if ( this._moveToTop() ) {
 				this._focusTabbable();
@@ -220,13 +221,13 @@ $.widget( "ui.dialog", {
 		this._position();
 		this._createOverlay();
 		this._moveToTop( null, true );
-		this._show( this.uiDialog, this.options.show );
-
-		this._focusTabbable();
+		this._show( this.uiDialog, this.options.show, function() {
+			that._focusTabbable();
+			that._trigger("focus");
+		});
 
 		this._isOpen = true;
 		this._trigger("open");
-		this._trigger("focus");
 	},
 
 	_focusTabbable: function() {
-- 
2.39.5