Skip to content
Permalink
Browse files

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

…684 - jQuery dialog with hide options does not trigger close event.
  • Loading branch information...
petersendidit authored and scottgonzalez committed Oct 17, 2012
1 parent dda1925 commit 35dc9307fc2ce5d2016e8848fdc578829867f97e
Showing with 20 additions and 3 deletions.
  1. +19 −2 tests/unit/dialog/dialog_events.js
  2. +1 −1 ui/jquery.ui.dialog.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() {
@@ -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 {

0 comments on commit 35dc930

Please sign in to comment.
You can’t perform that action at this time.