Dialog: Use _hide() to make sure close event gets triggered. Fixes #8…

…684 - jQuery dialog with hide options does not trigger close event.
jquery · Oct 18, 2012 · 35dc930 · 35dc930
1 parent dda1925
commit 35dc930
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/tests/unit/dialog/dialog_events.js b/tests/unit/dialog/dialog_events.js
@@ -195,8 +195,8 @@ test("resizeStop", function() {
 	el.remove();
 });
 
-test("close", function() {
-	expect(7);
+asyncTest("close", function() {
+	expect(14);
 
 	el = $('<div></div>').dialog({
 		close: function(ev, ui) {
@@ -212,6 +212,23 @@ test("close", function() {
 	});
 	el.dialog('close');
 	el.remove();
+
+	// Close event with an effect
+	el = $('<div></div>').dialog({
+		hide: 10,
+		close: function(ev, ui) {
+			ok(true, '.dialog("close") fires close callback');
+			equal(this, el[0], "context of callback");
+			equal(ev.type, 'dialogclose', 'event type in callback');
+			deepEqual(ui, {}, 'ui hash in callback');
+			start();
+		}
+	}).bind('dialogclose', function(ev, ui) {
+		ok(true, '.dialog("close") fires dialogclose event');
+		equal(this, el[0], 'context of event');
+		deepEqual(ui, {}, 'ui hash in event');
+	});
+	el.dialog('close');
 });
 
 test("beforeClose", function() {

diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
@@ -251,7 +251,7 @@ $.widget("ui.dialog", {
 		}
 
 		if ( this.options.hide ) {
-			this.uiDialog.hide( this.options.hide, function() {
+			this._hide( this.uiDialog, this.options.hide, function() {
 				that._trigger( "close", event );
 			});
 		} else {