Dialog: Removed handling of deprecated beforeclose option. Fixes #5100 - Dialog:...

diff --git a/tests/unit/dialog/dialog_events.js b/tests/unit/dialog/dialog_events.js
index 8c7657dfd091043bc1c12e09809859966864fe4e..40a8575b6530e139e17681e9700e27c94af73c75 100644 (file)
--- a/tests/unit/dialog/dialog_events.js
+++ b/tests/unit/dialog/dialog_events.js
@@ -212,38 +212,6 @@ test("close", function() {
        el.remove();
 });
 
-//handling of deprecated beforeclose (vs beforeClose) option
-//Ticket #4669 http://dev.jqueryui.com/ticket/4669
-//TODO: remove in 1.9pre
-test("beforeclose", function() {
-       expect(10);
-
-       el = $('<div></div>').dialog({
-               beforeclose: function(ev, ui) {
-                       ok(true, '.dialog("close") fires beforeClose callback');
-                       equals(this, el[0], "context of callback");
-                       equals(ev.type, 'dialogbeforeclose', 'event type in callback');
-                       same(ui, {}, 'ui hash in callback');
-                       return false;
-               }
-       });
-       el.dialog('close');
-       isOpen('beforeclose (deprecated) callback should prevent dialog from closing');
-       el.remove();
-
-       el = $('<div></div>').dialog();
-       el.dialog('option', 'beforeclose', function(ev, ui) {
-               ok(true, '.dialog("close") fires beforeClose callback');
-               equals(this, el[0], "context of callback");
-               equals(ev.type, 'dialogbeforeclose', 'event type in callback');
-               same(ui, {}, 'ui hash in callback');
-               return false;
-       });
-       el.dialog('close');
-       isOpen('beforeclose (deprecated) callback should prevent dialog from closing');
-       el.remove();
-});
-
 test("beforeClose", function() {
        expect(14);
 

diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 81df1d19b3840b944deaf5b8e738936d082dd5d6..5c1504aeb9ca786787637641d6f415844bfb6078 100644 (file)
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -171,13 +171,6 @@ $.widget("ui.dialog", {
                                .html(title)
                                .prependTo(uiDialogTitlebar);
 
-               //handling of deprecated beforeclose (vs beforeClose) option
-               //Ticket #4669 http://dev.jqueryui.com/ticket/4669
-               //TODO: remove in 1.9pre
-               if ($.isFunction(options.beforeclose) && !$.isFunction(options.beforeClose)) {
-                       options.beforeClose = options.beforeclose;
-               }
-
                uiDialogTitlebar.find("*").add(uiDialogTitlebar).disableSelection();
 
                if (options.draggable && $.fn.draggable) {
@@ -563,12 +556,6 @@ $.widget("ui.dialog", {
                        uiDialog = self.uiDialog;
 
                switch (key) {
-                       //handling of deprecated beforeclose (vs beforeClose) option
-                       //Ticket #4669 http://dev.jqueryui.com/ticket/4669
-                       //TODO: remove in 1.9pre
-                       case "beforeclose":
-                               key = "beforeClose";
-                               break;
                        case "buttons":
                                self._createButtons(value);
                                break;