library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Dialog: Use _hide() to make sure close event gets triggered. Fixes #8684 - jQuery dialog with hide options does not trigger close event.

Browse Source
This commit is contained in:
David Petersen 2012-10-17 09:28:51 -04:00 committed by Scott González
parent dda1925d0f
commit 35dc9307fc
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/unit/dialog/dialog_events.js
View File

@ -195,8 +195,8 @@ test("resizeStop", function() {
el.remove(); el.remove();
}); });
test("close", function() { asyncTest("close", function() {
expect(7); expect(14);
el = $('<div></div>').dialog({ el = $('<div></div>').dialog({
close: function(ev, ui) { close: function(ev, ui) {
@ -212,6 +212,23 @@ test("close", function() {
}); });
el.dialog('close'); el.dialog('close');
el.remove(); 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() { test("beforeClose", function() {

2
ui/jquery.ui.dialog.js vendored
View File

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