Dialog: Set the _isOpen flag before triggering the open event. Fixes …

…#6012 - Dialog: _isOpen flag should be set before triggering open event.
jquery · Sep 2, 2010 · de02aa3 · de02aa3
1 parent 5de8ced
commit de02aa3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/tests/unit/dialog/dialog_events.js b/tests/unit/dialog/dialog_events.js
@@ -6,11 +6,12 @@
 module("dialog: events");
 
 test("open", function() {
-	expect(11);
+	expect(13);
 
 	el = $("<div></div>");
 	el.dialog({
 		open: function(ev, ui) {
+			ok(el.data("dialog")._isOpen, "interal _isOpen flag is set");
 			ok(true, 'autoOpen: true fires open callback');
 			equals(this, el[0], "context of callback");
 			equals(ev.type, 'dialogopen', 'event type in callback');
@@ -29,6 +30,7 @@ test("open", function() {
 			same(ui, {}, 'ui hash in callback');
 		}
 	}).bind('dialogopen', function(ev, ui) {
+		ok(el.data("dialog")._isOpen, "interal _isOpen flag is set");
 		ok(true, 'dialog("open") fires open event');
 		equals(this, el[0], 'context of event');
 		same(ui, {}, 'ui hash in event');

diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
@@ -329,8 +329,8 @@ $.widget("ui.dialog", {
 			uiDialog.find('.ui-dialog-buttonpane :tabbable').get().concat(
 				uiDialog.get()))).eq(0).focus();
 
-		self._trigger('open');
 		self._isOpen = true;
+		self._trigger('open');
 
 		return self;
 	},