Skip to content

Commit de02aa3

Browse files
committed
Dialog: Set the _isOpen flag before triggering the open event. Fixes #6012 - Dialog: _isOpen flag should be set before triggering open event.
1 parent 5de8ced commit de02aa3

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

tests/unit/dialog/dialog_events.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
module("dialog: events");
77

88
test("open", function() {
9-
expect(11);
9+
expect(13);
1010

1111
el = $("<div></div>");
1212
el.dialog({
1313
open: function(ev, ui) {
14+
ok(el.data("dialog")._isOpen, "interal _isOpen flag is set");
1415
ok(true, 'autoOpen: true fires open callback');
1516
equals(this, el[0], "context of callback");
1617
equals(ev.type, 'dialogopen', 'event type in callback');
@@ -29,6 +30,7 @@ test("open", function() {
2930
same(ui, {}, 'ui hash in callback');
3031
}
3132
}).bind('dialogopen', function(ev, ui) {
33+
ok(el.data("dialog")._isOpen, "interal _isOpen flag is set");
3234
ok(true, 'dialog("open") fires open event');
3335
equals(this, el[0], 'context of event');
3436
same(ui, {}, 'ui hash in event');

ui/jquery.ui.dialog.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@ $.widget("ui.dialog", {
329329
uiDialog.find('.ui-dialog-buttonpane :tabbable').get().concat(
330330
uiDialog.get()))).eq(0).focus();
331331

332-
self._trigger('open');
333332
self._isOpen = true;
333+
self._trigger('open');
334334

335335
return self;
336336
},

0 commit comments

Comments
 (0)