From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 10 Dec 2010 19:31:36 +0000 (-0500)
Subject: Dialog: Removed handling of deprecated beforeclose option. Fixes #5100 - Dialog:... 
X-Git-Tag: 1.9m4~110
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b42125af4350eda14a6b15bb71f8dd336858fbd8;p=jquery-ui.git

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

diff --git a/tests/unit/dialog/dialog_events.js b/tests/unit/dialog/dialog_events.js
index 8c7657dfd..40a8575b6 100644
--- 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 81df1d19b..5c1504aeb 100644
--- 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;