Skip to content

Commit b42125a

Browse files
committed
Dialog: Removed handling of deprecated beforeclose option. Fixes #5100 - Dialog: remove deprecated dialog option beforeclose.
1 parent 9ad2a4b commit b42125a

File tree

2 files changed

+0
-45
lines changed

2 files changed

+0
-45
lines changed

tests/unit/dialog/dialog_events.js

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -212,38 +212,6 @@ test("close", function() {
212212
el.remove();
213213
});
214214

215-
//handling of deprecated beforeclose (vs beforeClose) option
216-
//Ticket #4669 http://dev.jqueryui.com/ticket/4669
217-
//TODO: remove in 1.9pre
218-
test("beforeclose", function() {
219-
expect(10);
220-
221-
el = $('<div></div>').dialog({
222-
beforeclose: function(ev, ui) {
223-
ok(true, '.dialog("close") fires beforeClose callback');
224-
equals(this, el[0], "context of callback");
225-
equals(ev.type, 'dialogbeforeclose', 'event type in callback');
226-
same(ui, {}, 'ui hash in callback');
227-
return false;
228-
}
229-
});
230-
el.dialog('close');
231-
isOpen('beforeclose (deprecated) callback should prevent dialog from closing');
232-
el.remove();
233-
234-
el = $('<div></div>').dialog();
235-
el.dialog('option', 'beforeclose', function(ev, ui) {
236-
ok(true, '.dialog("close") fires beforeClose callback');
237-
equals(this, el[0], "context of callback");
238-
equals(ev.type, 'dialogbeforeclose', 'event type in callback');
239-
same(ui, {}, 'ui hash in callback');
240-
return false;
241-
});
242-
el.dialog('close');
243-
isOpen('beforeclose (deprecated) callback should prevent dialog from closing');
244-
el.remove();
245-
});
246-
247215
test("beforeClose", function() {
248216
expect(14);
249217

ui/jquery.ui.dialog.js

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,6 @@ $.widget("ui.dialog", {
171171
.html(title)
172172
.prependTo(uiDialogTitlebar);
173173

174-
//handling of deprecated beforeclose (vs beforeClose) option
175-
//Ticket #4669 http://dev.jqueryui.com/ticket/4669
176-
//TODO: remove in 1.9pre
177-
if ($.isFunction(options.beforeclose) && !$.isFunction(options.beforeClose)) {
178-
options.beforeClose = options.beforeclose;
179-
}
180-
181174
uiDialogTitlebar.find("*").add(uiDialogTitlebar).disableSelection();
182175

183176
if (options.draggable && $.fn.draggable) {
@@ -563,12 +556,6 @@ $.widget("ui.dialog", {
563556
uiDialog = self.uiDialog;
564557

565558
switch (key) {
566-
//handling of deprecated beforeclose (vs beforeClose) option
567-
//Ticket #4669 http://dev.jqueryui.com/ticket/4669
568-
//TODO: remove in 1.9pre
569-
case "beforeclose":
570-
key = "beforeClose";
571-
break;
572559
case "buttons":
573560
self._createButtons(value);
574561
break;

0 commit comments

Comments
 (0)