From 6edce867339c5808eda428fa2566aa40da4b0202 Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Fri, 9 Nov 2012 18:26:30 +0100
Subject: Dialog: Remove attroperty workaround for title attribute. Make the
 default null, as it should be. No back-compat, as the behaviour doesn't
 change.

---
 tests/unit/dialog/dialog_options.js | 42 ++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 17 deletions(-)

(limited to 'tests/unit/dialog/dialog_options.js')

diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js
index 331230318..899dc1df6 100644
--- a/tests/unit/dialog/dialog_options.js
+++ b/tests/unit/dialog/dialog_options.js
@@ -415,37 +415,45 @@ test("resizable", function() {
 	el.remove();
 });
 
-test("title", function() {
-	expect(9);
+test( "title", function() {
+	expect( 11 );
 
 	function titleText() {
-		return el.dialog('widget').find(".ui-dialog-title").html();
+		return el.dialog('widget').find( ".ui-dialog-title" ).html();
 	}
 
-	var el = $('<div></div>').dialog();
+	var el = $( '<div></div>' ).dialog();
 		// some browsers return a non-breaking space and some return "&nbsp;"
 		// so we generate a non-breaking space for comparison
-		equal(titleText(), $( "<span>&#160;</span>" ).html(), "[default]");
-		equal(el.dialog("option", "title"), "", "option not changed");
+		equal( titleText(), $( "<span>&#160;</span>" ).html(), "[default]" );
+		equal( el.dialog( "option", "title" ), null, "option not changed" );
+	el.remove();
+
+	el = $( '<div title="foo">' ).dialog();
+		equal( titleText(), "foo", "title in element attribute" );
+		equal( el.dialog( "option", "title"), "foo", "option updated from attribute" );
 	el.remove();
 
-	el = $('<div title="foo">').dialog();
-		equal(titleText(), "foo", "title in element attribute");
-		equal(el.dialog("option", "title"), "foo", "option updated from attribute");
+	el = $( '<div></div>' ).dialog({ title: 'foo' });
+		equal( titleText(), "foo", "title in init options" );
+		equal( el.dialog("option", "title"), "foo", "opiton set from options hash" );
 	el.remove();
 
-	el = $('<div></div>').dialog({ title: 'foo' });
-		equal(titleText(), "foo", "title in init options");
-		equal(el.dialog("option", "title"), "foo", "opiton set from options hash");
+	el = $( '<div title="foo">' ).dialog({ title: 'bar' });
+		equal( titleText(), "bar", "title in init options should override title in element attribute" );
+		equal( el.dialog("option", "title"), "bar", "opiton set from options hash" );
 	el.remove();
 
-	el = $('<div title="foo">').dialog({ title: 'bar' });
-		equal(titleText(), "bar", "title in init options should override title in element attribute");
-		equal(el.dialog("option", "title"), "bar", "opiton set from options hash");
+	el = $( '<div></div>' ).dialog().dialog( 'option', 'title', 'foo' );
+		equal( titleText(), 'foo', 'title after init' );
 	el.remove();
 
-	el = $('<div></div>').dialog().dialog('option', 'title', 'foo');
-		equal(titleText(), 'foo', 'title after init');
+	// make sure attroperties are properly ignored - #5742 - .attr() might return a DOMElement
+	el = $( '<form><input name="title"></form>' ).dialog();
+		// some browsers return a non-breaking space and some return "&nbsp;"
+		// so we get the text to normalize to the actual non-breaking space
+		equal( titleText(), $( "<span>&#160;</span>" ).html(), "[default]" );
+		equal( el.dialog( "option", "title" ), null, "option not changed" );
 	el.remove();
 });
 
-- 
cgit v1.2.3


From 83a9f219bf40ff834d660020bbfa7de550e48a0c Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Thu, 15 Nov 2012 22:29:24 +0100
Subject: Dialog: Use button widget for close button (was already listed as
 dependency)

---
 demos/dialog/animated.html               |  1 +
 demos/dialog/default.html                |  1 +
 demos/dialog/modal-confirmation.html     |  1 +
 demos/dialog/modal-form.html             |  7 ++++---
 demos/dialog/modal-message.html          |  1 +
 demos/dialog/modal.html                  |  1 +
 tests/unit/dialog/dialog.html            |  1 +
 tests/unit/dialog/dialog_options.js      |  8 ++++----
 tests/visual/dialog/animated.html        |  1 +
 tests/visual/dialog/complex-dialogs.html |  1 +
 tests/visual/dialog/form.html            |  1 +
 tests/visual/dialog/performance.html     |  1 +
 themes/base/jquery.ui.dialog.css         | 12 ++----------
 ui/jquery.ui.dialog.js                   | 26 ++++++++++++--------------
 14 files changed, 32 insertions(+), 31 deletions(-)

(limited to 'tests/unit/dialog/dialog_options.js')

diff --git a/demos/dialog/animated.html b/demos/dialog/animated.html
index 8e1daf131..061396548 100644
--- a/demos/dialog/animated.html
+++ b/demos/dialog/animated.html
@@ -11,6 +11,7 @@
 	<script src="../../ui/jquery.ui.draggable.js"></script>
 	<script src="../../ui/jquery.ui.position.js"></script>
 	<script src="../../ui/jquery.ui.resizable.js"></script>
+	<script src="../../ui/jquery.ui.button.js"></script>
 	<script src="../../ui/jquery.ui.dialog.js"></script>
 	<script src="../../ui/jquery.ui.effect.js"></script>
 	<script src="../../ui/jquery.ui.effect-blind.js"></script>
diff --git a/demos/dialog/default.html b/demos/dialog/default.html
index 214f41d0d..777921e48 100644
--- a/demos/dialog/default.html
+++ b/demos/dialog/default.html
@@ -11,6 +11,7 @@
 	<script src="../../ui/jquery.ui.draggable.js"></script>
 	<script src="../../ui/jquery.ui.position.js"></script>
 	<script src="../../ui/jquery.ui.resizable.js"></script>
+	<script src="../../ui/jquery.ui.button.js"></script>
 	<script src="../../ui/jquery.ui.dialog.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
diff --git a/demos/dialog/modal-confirmation.html b/demos/dialog/modal-confirmation.html
index e73c9ea2b..04f5d93fb 100644
--- a/demos/dialog/modal-confirmation.html
+++ b/demos/dialog/modal-confirmation.html
@@ -11,6 +11,7 @@
 	<script src="../../ui/jquery.ui.button.js"></script>
 	<script src="../../ui/jquery.ui.draggable.js"></script>
 	<script src="../../ui/jquery.ui.position.js"></script>
+	<script src="../../ui/jquery.ui.button.js"></script>
 	<script src="../../ui/jquery.ui.dialog.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
diff --git a/demos/dialog/modal-form.html b/demos/dialog/modal-form.html
index a779494a4..b1d4e52cc 100644
--- a/demos/dialog/modal-form.html
+++ b/demos/dialog/modal-form.html
@@ -12,6 +12,7 @@
 	<script src="../../ui/jquery.ui.draggable.js"></script>
 	<script src="../../ui/jquery.ui.position.js"></script>
 	<script src="../../ui/jquery.ui.resizable.js"></script>
+	<script src="../../ui/jquery.ui.button.js"></script>
 	<script src="../../ui/jquery.ui.dialog.js"></script>
 	<script src="../../ui/jquery.ui.effect.js"></script>
 	<link rel="stylesheet" href="../demos.css">
@@ -86,10 +87,10 @@
 
 					if ( bValid ) {
 						$( "#users tbody" ).append( "<tr>" +
-							"<td>" + name.val() + "</td>" + 
-							"<td>" + email.val() + "</td>" + 
+							"<td>" + name.val() + "</td>" +
+							"<td>" + email.val() + "</td>" +
 							"<td>" + password.val() + "</td>" +
-						"</tr>" ); 
+						"</tr>" );
 						$( this ).dialog( "close" );
 					}
 				},
diff --git a/demos/dialog/modal-message.html b/demos/dialog/modal-message.html
index 60b7c3e15..19fc0e829 100644
--- a/demos/dialog/modal-message.html
+++ b/demos/dialog/modal-message.html
@@ -12,6 +12,7 @@
 	<script src="../../ui/jquery.ui.draggable.js"></script>
 	<script src="../../ui/jquery.ui.position.js"></script>
 	<script src="../../ui/jquery.ui.resizable.js"></script>
+	<script src="../../ui/jquery.ui.button.js"></script>
 	<script src="../../ui/jquery.ui.dialog.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
diff --git a/demos/dialog/modal.html b/demos/dialog/modal.html
index 886a3516c..a59358d53 100644
--- a/demos/dialog/modal.html
+++ b/demos/dialog/modal.html
@@ -11,6 +11,7 @@
 	<script src="../../ui/jquery.ui.draggable.js"></script>
 	<script src="../../ui/jquery.ui.position.js"></script>
 	<script src="../../ui/jquery.ui.resizable.js"></script>
+	<script src="../../ui/jquery.ui.button.js"></script>
 	<script src="../../ui/jquery.ui.dialog.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<script>
diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html
index cb74bb654..0022b42cf 100644
--- a/tests/unit/dialog/dialog.html
+++ b/tests/unit/dialog/dialog.html
@@ -19,6 +19,7 @@
 			"ui/jquery.ui.mouse.js",
 			"ui/jquery.ui.draggable.js",
 			"ui/jquery.ui.resizable.js",
+			"ui/jquery.ui.button.js",
 			"ui/jquery.ui.dialog.js"
 		]
 	});
diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js
index 899dc1df6..2df7196dc 100644
--- a/tests/unit/dialog/dialog_options.js
+++ b/tests/unit/dialog/dialog_options.js
@@ -35,7 +35,7 @@ test("buttons", function() {
 		},
 		el = $('<div></div>').dialog({ buttons: buttons });
 
-	btn = $("button", el.dialog('widget'));
+	btn = el.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
 	equal(btn.length, 2, "number of buttons");
 
 	i = 0;
@@ -61,7 +61,7 @@ test("buttons", function() {
 	el.dialog("option", "buttons", newButtons);
 	deepEqual(el.dialog("option", "buttons"), newButtons, '.dialog("option", "buttons", ...) setter');
 
-	btn = $("button", el.dialog('widget'));
+	btn = el.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
 	equal(btn.length, 1, "number of buttons after setter");
 	btn.trigger('click');
 
@@ -72,7 +72,7 @@ test("buttons", function() {
 	});
 
 	el.dialog("option", "buttons", null);
-	btn = $("button", el.dialog('widget'));
+	btn = el.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
 	equal(btn.length, 0, "all buttons have been removed");
 	equal(el.find(".ui-dialog-buttonset").length, 0, "buttonset has been removed");
 	equal(el.parent().hasClass('ui-dialog-buttons'), false, "dialog wrapper removes class about having buttons");
@@ -97,7 +97,7 @@ test("buttons - advanced", function() {
 			]
 		});
 
-	buttons = el.dialog('widget').find("button");
+	buttons = el.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
 	equal(buttons.length, 1, "correct number of buttons");
 	equal(buttons.attr("id"), "my-button-id", "correct id");
 	equal(buttons.text(), "a button", "correct label");
diff --git a/tests/visual/dialog/animated.html b/tests/visual/dialog/animated.html
index d1f5acb10..07097fbfa 100644
--- a/tests/visual/dialog/animated.html
+++ b/tests/visual/dialog/animated.html
@@ -11,6 +11,7 @@
 	<script src="../../../ui/jquery.ui.draggable.js"></script>
 	<script src="../../../ui/jquery.ui.position.js"></script>
 	<script src="../../../ui/jquery.ui.resizable.js"></script>
+	<script src="../../../ui/jquery.ui.button.js"></script>
 	<script src="../../../ui/jquery.ui.dialog.js"></script>
 	<script src="../../../ui/jquery.ui.effect.js"></script>
 	<script src="../../../ui/jquery.ui.effect-blind.js"></script>
diff --git a/tests/visual/dialog/complex-dialogs.html b/tests/visual/dialog/complex-dialogs.html
index 6399d8a4b..2b9a0d3a6 100644
--- a/tests/visual/dialog/complex-dialogs.html
+++ b/tests/visual/dialog/complex-dialogs.html
@@ -11,6 +11,7 @@
 	<script src="../../../ui/jquery.ui.draggable.js"></script>
 	<script src="../../../ui/jquery.ui.position.js"></script>
 	<script src="../../../ui/jquery.ui.resizable.js"></script>
+	<script src="../../../ui/jquery.ui.button.js"></script>
 	<script src="../../../ui/jquery.ui.dialog.js"></script>
 
 	<!-- stuff needed to make things complex -->
diff --git a/tests/visual/dialog/form.html b/tests/visual/dialog/form.html
index 867991911..ed70ec69b 100644
--- a/tests/visual/dialog/form.html
+++ b/tests/visual/dialog/form.html
@@ -11,6 +11,7 @@
 	<script src="../../../ui/jquery.ui.draggable.js"></script>
 	<script src="../../../ui/jquery.ui.position.js"></script>
 	<script src="../../../ui/jquery.ui.resizable.js"></script>
+	<script src="../../../ui/jquery.ui.button.js"></script>
 	<script src="../../../ui/jquery.ui.dialog.js"></script>
 	<script src="../../../ui/jquery.ui.effect.js"></script>
 	<script src="../../../ui/jquery.ui.effect-blind.js"></script>
diff --git a/tests/visual/dialog/performance.html b/tests/visual/dialog/performance.html
index 937b9464f..8f63d6a69 100644
--- a/tests/visual/dialog/performance.html
+++ b/tests/visual/dialog/performance.html
@@ -11,6 +11,7 @@
 	<script src="../../../ui/jquery.ui.mouse.js"></script>
 	<script src="../../../ui/jquery.ui.draggable.js"></script>
 	<script src="../../../ui/jquery.ui.resizable.js"></script>
+	<script src="../../../ui/jquery.ui.button.js"></script>
 	<script src="../../../ui/jquery.ui.dialog.js"></script>
 	<script>
 	$(function() {
diff --git a/themes/base/jquery.ui.dialog.css b/themes/base/jquery.ui.dialog.css
index f1b25c104..d278d9649 100644
--- a/themes/base/jquery.ui.dialog.css
+++ b/themes/base/jquery.ui.dialog.css
@@ -29,18 +29,10 @@
 	position: absolute;
 	right: .3em;
 	top: 50%;
-	width: 19px;
+	width: 21px;
 	margin: -10px 0 0 0;
 	padding: 1px;
-	height: 18px;
-}
-.ui-dialog .ui-dialog-titlebar-close span {
-	display: block;
-	margin: 1px;
-}
-.ui-dialog .ui-dialog-titlebar-close:hover,
-.ui-dialog .ui-dialog-titlebar-close:focus {
-	padding: 0;
+	height: 20px;
 }
 .ui-dialog .ui-dialog-content {
 	position: relative;
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index b860a8b18..055040b32 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -99,7 +99,6 @@ $.widget("ui.dialog", {
 			uiDialog,
 			// TODO should use this.uiDialogTitlebar instead
 			uiDialogTitlebar,
-			uiDialogTitlebarClose,
 			uiDialogTitle,
 			uiDialogButtonPane;
 
@@ -139,20 +138,21 @@ $.widget("ui.dialog", {
 				})
 				.prependTo( uiDialog );
 
-			uiDialogTitlebarClose = $( "<a href='#'></a>" )
-				.addClass( "ui-dialog-titlebar-close  ui-corner-all" )
-				.attr( "role", "button" )
+			this.uiDialogTitlebarClose = $( "<button></button>" )
+				.button({
+					label: options.closeText,
+					icons: {
+						primary: "ui-icon-closethick"
+					},
+					text: false
+				})
+				.addClass( "ui-dialog-titlebar-close" )
 				.click(function( event ) {
 					event.preventDefault();
 					that.close( event );
 				})
 				.appendTo( uiDialogTitlebar );
 
-			( this.uiDialogTitlebarCloseText = $( "<span>" ) )
-				.addClass( "ui-icon ui-icon-closethick" )
-				.text( options.closeText )
-				.appendTo( uiDialogTitlebarClose );
-
 			uiDialogTitle = $( "<span>" )
 				.uniqueId()
 				.addClass( "ui-dialog-title" )
@@ -183,10 +183,6 @@ $.widget("ui.dialog", {
 			});
 		}
 
-		// TODO use button? or at least a button element, so that SPACE works?
-		this._hoverable( uiDialogTitlebarClose );
-		this._focusable( uiDialogTitlebarClose );
-
 		if ( options.draggable && $.fn.draggable ) {
 			this._makeDraggable();
 		}
@@ -575,7 +571,9 @@ $.widget("ui.dialog", {
 				break;
 			case "closeText":
 				// ensure that we always pass a string
-				this.uiDialogTitlebarCloseText.text( "" + value );
+				this.uiDialogTitlebarClose.button({
+					label: "" + value
+				});
 				break;
 			case "dialogClass":
 				uiDialog
-- 
cgit v1.2.3


From fed2972027f362181a614750fbaa7e252d1c1cb2 Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Thu, 15 Nov 2012 22:51:26 +0100
Subject: Dialog: Refactor _setOption to call _super early. Move dialogClass
 update above that to access old option value.

---
 tests/unit/dialog/dialog_options.js |  5 ++++-
 ui/jquery.ui.dialog.js              | 15 ++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'tests/unit/dialog/dialog_options.js')

diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js
index 2df7196dc..0be8c2b7f 100644
--- a/tests/unit/dialog/dialog_options.js
+++ b/tests/unit/dialog/dialog_options.js
@@ -148,7 +148,7 @@ test("closeText", function() {
 });
 
 test("dialogClass", function() {
-	expect(4);
+	expect( 6 );
 
 	var el = $('<div></div>').dialog();
 		equal(el.dialog('widget').is(".foo"), false, 'dialogClass not specified. foo class added');
@@ -156,6 +156,9 @@ test("dialogClass", function() {
 
 	el = $('<div></div>').dialog({ dialogClass: "foo" });
 		equal(el.dialog('widget').is(".foo"), true, 'dialogClass in init. foo class added');
+	el.dialog( "option", "dialogClass", "foobar" );
+		equal( el.dialog('widget').is(".foo"), false, "dialogClass changed, previous one was removed" );
+		equal( el.dialog('widget').is(".foobar"), true, "dialogClass changed, new one was added" );
 	el.remove();
 
 	el = $('<div></div>').dialog({ dialogClass: "foo bar" });
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 055040b32..cb4230eac 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -565,6 +565,14 @@ $.widget("ui.dialog", {
 		var isDraggable, isResizable,
 			uiDialog = this.uiDialog;
 
+		if ( key === "dialogClass" ) {
+			uiDialog
+				.removeClass( this.options.dialogClass )
+				.addClass( value );
+		}
+
+		this._super( key, value );
+
 		switch ( key ) {
 			case "buttons":
 				this._createButtons( value );
@@ -575,11 +583,6 @@ $.widget("ui.dialog", {
 					label: "" + value
 				});
 				break;
-			case "dialogClass":
-				uiDialog
-					.removeClass( this.options.dialogClass )
-					.addClass( value );
-				break;
 			case "disabled":
 				// TODO use toggleClass( "ui-dialog-disabled", value )
 				if ( value ) {
@@ -625,8 +628,6 @@ $.widget("ui.dialog", {
 					.html( "" + ( value || "&#160;" ) );
 				break;
 		}
-
-		this._super( key, value );
 	},
 
 	_size: function() {
-- 
cgit v1.2.3


From 999617343f7b813dc1c8d9c9048489e4d99d0470 Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Fri, 16 Nov 2012 19:26:22 +0100
Subject: Dialog: Pass through icons and showText (as 'text') options to
 button. Fixes #6830 - Allow Icons to be specified for Dialog buttons.

---
 tests/unit/dialog/dialog_options.js      | 10 ++++++++--
 tests/visual/dialog/complex-dialogs.html | 13 ++++++++++++-
 ui/jquery.ui.dialog.js                   |  6 ++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

(limited to 'tests/unit/dialog/dialog_options.js')

diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js
index 0be8c2b7f..beb60a642 100644
--- a/tests/unit/dialog/dialog_options.js
+++ b/tests/unit/dialog/dialog_options.js
@@ -81,7 +81,7 @@ test("buttons", function() {
 });
 
 test("buttons - advanced", function() {
-	expect(5);
+	expect( 7 );
 
 	var buttons,
 		el = $("<div></div>").dialog({
@@ -92,7 +92,11 @@ test("buttons - advanced", function() {
 					id: "my-button-id",
 					click: function() {
 						equal(this, el[0], "correct context");
-					}
+					},
+					icons: {
+						primary: "ui-icon-cancel"
+					},
+					showText: false
 				}
 			]
 		});
@@ -102,6 +106,8 @@ test("buttons - advanced", function() {
 	equal(buttons.attr("id"), "my-button-id", "correct id");
 	equal(buttons.text(), "a button", "correct label");
 	ok(buttons.hasClass("additional-class"), "additional classes added");
+	deepEqual( buttons.button("option", "icons"), { primary: "ui-icon-cancel", secondary: null } );
+	equal( buttons.button( "option", "text" ), false );
 	buttons.click();
 
 	el.remove();
diff --git a/tests/visual/dialog/complex-dialogs.html b/tests/visual/dialog/complex-dialogs.html
index 8e5d84d3d..46d2539c5 100644
--- a/tests/visual/dialog/complex-dialogs.html
+++ b/tests/visual/dialog/complex-dialogs.html
@@ -28,10 +28,21 @@
 				width: 500,
 				buttons: [
 					{
+						click: $.noop,
+						icons: {
+							primary: "ui-icon-check"
+						},
 						text: "Ok"
 					},
 					{
-						text: "Cancel"
+						click: function() {
+							$( this ).dialog( "close" );
+						},
+						icons: {
+							primary: "ui-icon-cancel"
+						},
+						text: "Cancel",
+						showText: false
 					}
 				]
 			}),
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 23c973975..003389823 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -383,8 +383,10 @@ $.widget("ui.dialog", {
 					click.apply( that.element[0], arguments );
 				};
 				$( "<button></button>", props )
-					// TODO allow passing through button options
-					.button()
+					.button({
+						icons: props.icons,
+						text: props.showText
+					})
 					.appendTo( that.uiButtonSet );
 			});
 			this.uiDialog.addClass( "ui-dialog-buttons" );
-- 
cgit v1.2.3


From a0310eb091f679c8ba002d57a30b53f8e7ea8ef3 Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Sat, 17 Nov 2012 12:10:26 +0100
Subject: Dialog: Move array notation support for position option to backCompat
 check. Fixes #8824 - Deprecate array notation for position option.

---
 build/tasks/testswarm.js                 |  1 +
 tests/unit/all.html                      |  1 +
 tests/unit/dialog/dialog.html            |  3 ++
 tests/unit/dialog/dialog_deprecated.html | 62 +++++++++++++++++++++++++
 tests/unit/dialog/dialog_deprecated.js   | 23 +++++++++
 tests/unit/dialog/dialog_options.js      | 20 --------
 ui/jquery.ui.dialog.js                   | 80 +++++++++++++++++++++++---------
 7 files changed, 147 insertions(+), 43 deletions(-)
 create mode 100644 tests/unit/dialog/dialog_deprecated.html
 create mode 100644 tests/unit/dialog/dialog_deprecated.js

(limited to 'tests/unit/dialog/dialog_options.js')

diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js
index 0685315e6..96415aa74 100644
--- a/build/tasks/testswarm.js
+++ b/build/tasks/testswarm.js
@@ -15,6 +15,7 @@ var versions = {
 		"Core": "core/core.html",
 		"Datepicker": "datepicker/datepicker.html",
 		"Dialog": "dialog/dialog.html",
+		"Dialog_deprecated": "dialog/dialog_deprecated.html",
 		"Draggable": "draggable/draggable.html",
 		"Droppable": "droppable/droppable.html",
 		"Effects": "effects/effects.html",
diff --git a/tests/unit/all.html b/tests/unit/all.html
index 7581a737b..25116846f 100644
--- a/tests/unit/all.html
+++ b/tests/unit/all.html
@@ -22,6 +22,7 @@
 			"core/core.html",
 			"datepicker/datepicker.html",
 			"dialog/dialog.html",
+			"dialog/dialog_deprecated.html",
 			"draggable/draggable.html",
 			"droppable/droppable.html",
 			"effects/effects.html",
diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html
index 0b5ca4856..5413e7cc1 100644
--- a/tests/unit/dialog/dialog.html
+++ b/tests/unit/dialog/dialog.html
@@ -5,6 +5,9 @@
 	<title>jQuery UI Dialog Test Suite</title>
 
 	<script src="../../jquery.js"></script>
+	<script>
+	$.uiBackCompat = false;
+	</script>
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
diff --git a/tests/unit/dialog/dialog_deprecated.html b/tests/unit/dialog/dialog_deprecated.html
new file mode 100644
index 000000000..2a876ac73
--- /dev/null
+++ b/tests/unit/dialog/dialog_deprecated.html
@@ -0,0 +1,62 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<title>jQuery UI Dialog Test Suite</title>
+
+	<script src="../../jquery.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
+	<script>
+	TestHelpers.loadResources({
+		css: [ "ui.core", "ui.dialog" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.position.js",
+			"ui/jquery.ui.mouse.js",
+			"ui/jquery.ui.draggable.js",
+			"ui/jquery.ui.resizable.js",
+			"ui/jquery.ui.button.js",
+			"ui/jquery.ui.dialog.js"
+		]
+	});
+	</script>
+
+	<script src="dialog_common.js"></script>
+	<script src="dialog_core.js"></script>
+	<script src="dialog_events.js"></script>
+	<script src="dialog_methods.js"></script>
+	<script src="dialog_options.js"></script>
+	<script src="dialog_test_helpers.js"></script>
+	<script src="dialog_tickets.js"></script>
+	<script src="dialog_deprecated.js"></script>
+
+	<script src="../swarminject.js"></script>
+</head>
+<body>
+
+<h1 id="qunit-header">jQuery UI Dialog Test Suite</h1>
+<h2 id="qunit-banner"></h2>
+<div id="qunit-testrunner-toolbar"></div>
+<h2 id="qunit-userAgent"></h2>
+<ol id="qunit-tests"></ol>
+<div id="qunit-fixture">
+	<div id="dialog1"></div>
+	<div id="dialog2"></div>
+	<div id="form-dialog" title="Profile Information">
+		<fieldset>
+			<legend>Please share some personal information</legend>
+			<label for="favorite-animal">Your favorite animal</label><input id="favorite-animal">
+			<label for="favorite-color">Your favorite color</label><input id="favorite-color">
+		</fieldset>
+		<div role="group" aria-describedby="section2">
+			<p id="section2">Some more (optional) information</p>
+			<label for="favorite-food">Favorite food</label><input id="favorite-food">
+		</div>
+	</div>
+</div>
+</body>
+</html>
diff --git a/tests/unit/dialog/dialog_deprecated.js b/tests/unit/dialog/dialog_deprecated.js
new file mode 100644
index 000000000..06052b6bf
--- /dev/null
+++ b/tests/unit/dialog/dialog_deprecated.js
@@ -0,0 +1,23 @@
+module("dialog (deprecated): position opton with array");
+
+if ( !$.ui.ie ) {
+	test("position, right bottom on window w/array", function() {
+		expect( 2 );
+		var el = $('<div></div>').dialog({ position: ["right", "bottom"] }),
+			dialog = el.dialog('widget'),
+			offset = dialog.offset();
+		closeEnough(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft(), 1);
+		closeEnough(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop(), 1);
+		el.remove();
+	});
+}
+
+test("position, offset from top left w/array", function() {
+	expect( 2 );
+	var el = $('<div></div>').dialog({ position: [10, 10] }),
+		dialog = el.dialog('widget'),
+		offset = dialog.offset();
+	closeEnough(offset.left, 10 + $(window).scrollLeft(), 1);
+	closeEnough(offset.top, 10 + $(window).scrollTop(), 1);
+	el.remove();
+});
diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js
index beb60a642..4e11ecf62 100644
--- a/tests/unit/dialog/dialog_options.js
+++ b/tests/unit/dialog/dialog_options.js
@@ -331,16 +331,6 @@ if ( !$.ui.ie ) {
 		el.remove();
 	});
 
-	test("position, right bottom on window w/array", function() {
-		expect( 2 );
-		var el = $('<div></div>').dialog({ position: ["right", "bottom"] }),
-			dialog = el.dialog('widget'),
-			offset = dialog.offset();
-		closeEnough(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft(), 1);
-		closeEnough(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop(), 1);
-		el.remove();
-	});
-
 	test("position, right bottom at right bottom via ui.position args", function() {
 		expect( 2 );
 		var el = $('<div></div>').dialog({
@@ -359,16 +349,6 @@ if ( !$.ui.ie ) {
 
 }
 
-test("position, offset from top left w/array", function() {
-	expect( 2 );
-	var el = $('<div></div>').dialog({ position: [10, 10] }),
-		dialog = el.dialog('widget'),
-		offset = dialog.offset();
-	closeEnough(offset.left, 10 + $(window).scrollLeft(), 1);
-	closeEnough(offset.top, 10 + $(window).scrollTop(), 1);
-	el.remove();
-});
-
 test("position, at another element", function() {
 	expect( 4 );
 	var parent = $('<div></div>').css({
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 8e5ca66c1..781fa8fa6 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -211,7 +211,7 @@ $.widget("ui.dialog", {
 		this.opener = $( this.document[ 0 ].activeElement );
 
 		this._size();
-		this._position( this.options.position );
+		this._position();
 		if ( this.options.modal ) {
 			this.overlay = new $.ui.dialog.overlay( this );
 		}
@@ -500,38 +500,24 @@ $.widget("ui.dialog", {
 		}
 	},
 
-	_position: function( position ) {
-		var myAt = [],
-			offset = [ 0, 0 ],
+	_position: function() {
+		var position = this.options.position,
+			myAt = [],
 			isVisible;
 
 		if ( position ) {
-			// TODO we don't support 1.3.2 anymore, clean this mess up
-			// deep extending converts arrays to objects in jQuery <= 1.3.2 :-(
-	//		if (typeof position == 'string' || $.isArray(position)) {
-	//			myAt = $.isArray(position) ? position : position.split(' ');
-
-			if ( typeof position === "string" || (typeof position === "object" && "0" in position ) ) {
-				myAt = position.split ? position.split( " " ) : [ position[ 0 ], position[ 1 ] ];
+			if ( typeof position === "string" ) {
+				myAt = position.split( " " );
 				if ( myAt.length === 1 ) {
 					myAt[ 1 ] = myAt[ 0 ];
 				}
-
-				$.each( [ "left", "top" ], function( i, offsetPosition ) {
-					if ( +myAt[ i ] === myAt[ i ] ) {
-						offset[ i ] = myAt[ i ];
-						myAt[ i ] = offsetPosition;
-					}
-				});
-
 				position = {
-					my: myAt[0] + (offset[0] < 0 ? offset[0] : "+" + offset[0]) + " " +
-						myAt[1] + (offset[1] < 0 ? offset[1] : "+" + offset[1]),
+					my: myAt[0] + " " + myAt[1],
 					at: myAt.join( " " )
 				};
+				position = $.extend( {}, $.ui.dialog.prototype.options.position, position );
 			}
 
-			position = $.extend( {}, $.ui.dialog.prototype.options.position, position );
 		} else {
 			position = $.ui.dialog.prototype.options.position;
 		}
@@ -610,7 +596,7 @@ $.widget("ui.dialog", {
 		}
 
 		if ( key === "position" ) {
-			this._position( value );
+			this._position();
 		}
 
 		if ( key === "resizable" ) {
@@ -744,4 +730,52 @@ $.extend( $.ui.dialog.overlay.prototype, {
 	}
 });
 
+// DEPRECATED
+if ( $.uiBackCompat !== false ) {
+	// position option with array notation
+	// just override with old implementation
+	$.ui.dialog.prototype._position = function() {
+		var position = this.options.position,
+			myAt = [],
+			offset = [ 0, 0 ],
+			isVisible;
+
+		if ( position ) {
+			if ( typeof position === "string" || (typeof position === "object" && "0" in position ) ) {
+				myAt = position.split ? position.split( " " ) : [ position[ 0 ], position[ 1 ] ];
+				if ( myAt.length === 1 ) {
+					myAt[ 1 ] = myAt[ 0 ];
+				}
+
+				$.each( [ "left", "top" ], function( i, offsetPosition ) {
+					if ( +myAt[ i ] === myAt[ i ] ) {
+						offset[ i ] = myAt[ i ];
+						myAt[ i ] = offsetPosition;
+					}
+				});
+
+				position = {
+					my: myAt[0] + (offset[0] < 0 ? offset[0] : "+" + offset[0]) + " " +
+						myAt[1] + (offset[1] < 0 ? offset[1] : "+" + offset[1]),
+					at: myAt.join( " " )
+				};
+			}
+
+			position = $.extend( {}, $.ui.dialog.prototype.options.position, position );
+		} else {
+			position = $.ui.dialog.prototype.options.position;
+		}
+
+		// need to show the dialog to get the actual offset in the position plugin
+		isVisible = this.uiDialog.is( ":visible" );
+		if ( !isVisible ) {
+			this.uiDialog.show();
+		}
+		this.uiDialog.position( position );
+		if ( !isVisible ) {
+			this.uiDialog.hide();
+		}
+	};
+}
+
 }( jQuery ) );
-- 
cgit v1.2.3


From a09f5c07f591d0ef198f1a36fab9d4b6061ecbc6 Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Wed, 21 Nov 2012 16:33:46 +0100
Subject: Dialog: Follow-up to 9fe3a62d8 - also deprecate string notation for
 position option.

---
 tests/unit/dialog/dialog_deprecated.js |  32 ++++++++++-
 tests/unit/dialog/dialog_options.js    |  32 -----------
 ui/jquery.ui.dialog.js                 | 101 +++++++++++++--------------------
 3 files changed, 72 insertions(+), 93 deletions(-)

(limited to 'tests/unit/dialog/dialog_options.js')

diff --git a/tests/unit/dialog/dialog_deprecated.js b/tests/unit/dialog/dialog_deprecated.js
index 06052b6bf..fcbd22faa 100644
--- a/tests/unit/dialog/dialog_deprecated.js
+++ b/tests/unit/dialog/dialog_deprecated.js
@@ -1,4 +1,4 @@
-module("dialog (deprecated): position opton with array");
+module("dialog (deprecated): position option with string and array");
 
 if ( !$.ui.ie ) {
 	test("position, right bottom on window w/array", function() {
@@ -10,6 +10,16 @@ if ( !$.ui.ie ) {
 		closeEnough(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop(), 1);
 		el.remove();
 	});
+
+	test("position, right bottom on window", function() {
+		expect( 2 );
+		var el = $('<div></div>').dialog({ position: "right bottom" }),
+			dialog = el.dialog('widget'),
+			offset = dialog.offset();
+		closeEnough(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft(), 1);
+		closeEnough(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop(), 1);
+		el.remove();
+	});
 }
 
 test("position, offset from top left w/array", function() {
@@ -21,3 +31,23 @@ test("position, offset from top left w/array", function() {
 	closeEnough(offset.top, 10 + $(window).scrollTop(), 1);
 	el.remove();
 });
+
+test("position, top on window", function() {
+	expect( 2 );
+	var el = $('<div></div>').dialog({ position: "top" }),
+		dialog = el.dialog('widget'),
+		offset = dialog.offset();
+	closeEnough(offset.left, Math.round($(window).width() / 2 - dialog.outerWidth() / 2) + $(window).scrollLeft(), 1);
+	closeEnough(offset.top, $(window).scrollTop(), 1);
+	el.remove();
+});
+
+test("position, left on window", function() {
+	expect( 2 );
+	var el = $('<div></div>').dialog({ position: "left" }),
+		dialog = el.dialog('widget'),
+		offset = dialog.offset();
+	closeEnough(offset.left, 0, 1);
+	closeEnough(offset.top, Math.round($(window).height() / 2 - dialog.outerHeight() / 2) + $(window).scrollTop(), 1);
+	el.remove();
+});
diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js
index 4e11ecf62..f01a1a2a8 100644
--- a/tests/unit/dialog/dialog_options.js
+++ b/tests/unit/dialog/dialog_options.js
@@ -298,39 +298,8 @@ test("position, default center on window", function() {
 	el.remove();
 });
 
-test("position, top on window", function() {
-	expect( 2 );
-	var el = $('<div></div>').dialog({ position: "top" }),
-		dialog = el.dialog('widget'),
-		offset = dialog.offset();
-	closeEnough(offset.left, Math.round($(window).width() / 2 - dialog.outerWidth() / 2) + $(window).scrollLeft(), 1);
-	closeEnough(offset.top, $(window).scrollTop(), 1);
-	el.remove();
-});
-
-test("position, left on window", function() {
-	expect( 2 );
-	var el = $('<div></div>').dialog({ position: "left" }),
-		dialog = el.dialog('widget'),
-		offset = dialog.offset();
-	closeEnough(offset.left, 0, 1);
-	closeEnough(offset.top, Math.round($(window).height() / 2 - dialog.outerHeight() / 2) + $(window).scrollTop(), 1);
-	el.remove();
-});
-
 // todo: figure out these fails in IE7
 if ( !$.ui.ie ) {
-
-	test("position, right bottom on window", function() {
-		expect( 2 );
-		var el = $('<div></div>').dialog({ position: "right bottom" }),
-			dialog = el.dialog('widget'),
-			offset = dialog.offset();
-		closeEnough(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft(), 1);
-		closeEnough(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop(), 1);
-		el.remove();
-	});
-
 	test("position, right bottom at right bottom via ui.position args", function() {
 		expect( 2 );
 		var el = $('<div></div>').dialog({
@@ -346,7 +315,6 @@ if ( !$.ui.ie ) {
 		closeEnough(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop(), 1);
 		el.remove();
 	});
-
 }
 
 test("position, at another element", function() {
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index b998c2558..b9f73e954 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -495,33 +495,12 @@ $.widget("ui.dialog", {
 	},
 
 	_position: function() {
-		var position = this.options.position,
-			myAt = [],
-			isVisible;
-
-		if ( position ) {
-			if ( typeof position === "string" ) {
-				myAt = position.split( " " );
-				if ( myAt.length === 1 ) {
-					myAt[ 1 ] = myAt[ 0 ];
-				}
-				position = {
-					my: myAt[0] + " " + myAt[1],
-					at: myAt.join( " " )
-				};
-				position = $.extend( {}, $.ui.dialog.prototype.options.position, position );
-			}
-
-		} else {
-			position = $.ui.dialog.prototype.options.position;
-		}
-
 		// need to show the dialog to get the actual offset in the position plugin
-		isVisible = this.uiDialog.is( ":visible" );
+		var isVisible = this.uiDialog.is( ":visible" );
 		if ( !isVisible ) {
 			this.uiDialog.show();
 		}
-		this.uiDialog.position( position );
+		this.uiDialog.position( this.options.position );
 		if ( !isVisible ) {
 			this.uiDialog.hide();
 		}
@@ -719,48 +698,50 @@ $.ui.dialog.overlay = {
 if ( $.uiBackCompat !== false ) {
 	// position option with array notation
 	// just override with old implementation
-	$.ui.dialog.prototype._position = function() {
-		var position = this.options.position,
-			myAt = [],
-			offset = [ 0, 0 ],
-			isVisible;
-
-		if ( position ) {
-			if ( typeof position === "string" || (typeof position === "object" && "0" in position ) ) {
-				myAt = position.split ? position.split( " " ) : [ position[ 0 ], position[ 1 ] ];
-				if ( myAt.length === 1 ) {
-					myAt[ 1 ] = myAt[ 0 ];
-				}
-
-				$.each( [ "left", "top" ], function( i, offsetPosition ) {
-					if ( +myAt[ i ] === myAt[ i ] ) {
-						offset[ i ] = myAt[ i ];
-						myAt[ i ] = offsetPosition;
+	$.widget( "ui.dialog", $.ui.dialog, {
+		_position: function() {
+			var position = this.options.position,
+				myAt = [],
+				offset = [ 0, 0 ],
+				isVisible;
+
+			if ( position ) {
+				if ( typeof position === "string" || (typeof position === "object" && "0" in position ) ) {
+					myAt = position.split ? position.split( " " ) : [ position[ 0 ], position[ 1 ] ];
+					if ( myAt.length === 1 ) {
+						myAt[ 1 ] = myAt[ 0 ];
 					}
-				});
 
-				position = {
-					my: myAt[0] + (offset[0] < 0 ? offset[0] : "+" + offset[0]) + " " +
-						myAt[1] + (offset[1] < 0 ? offset[1] : "+" + offset[1]),
-					at: myAt.join( " " )
-				};
-			}
+					$.each( [ "left", "top" ], function( i, offsetPosition ) {
+						if ( +myAt[ i ] === myAt[ i ] ) {
+							offset[ i ] = myAt[ i ];
+							myAt[ i ] = offsetPosition;
+						}
+					});
 
-			position = $.extend( {}, $.ui.dialog.prototype.options.position, position );
-		} else {
-			position = $.ui.dialog.prototype.options.position;
-		}
+					position = {
+						my: myAt[0] + (offset[0] < 0 ? offset[0] : "+" + offset[0]) + " " +
+							myAt[1] + (offset[1] < 0 ? offset[1] : "+" + offset[1]),
+						at: myAt.join( " " )
+					};
+				}
 
-		// need to show the dialog to get the actual offset in the position plugin
-		isVisible = this.uiDialog.is( ":visible" );
-		if ( !isVisible ) {
-			this.uiDialog.show();
-		}
-		this.uiDialog.position( position );
-		if ( !isVisible ) {
-			this.uiDialog.hide();
+				position = $.extend( {}, $.ui.dialog.prototype.options.position, position );
+			} else {
+				position = $.ui.dialog.prototype.options.position;
+			}
+
+			// need to show the dialog to get the actual offset in the position plugin
+			isVisible = this.uiDialog.is( ":visible" );
+			if ( !isVisible ) {
+				this.uiDialog.show();
+			}
+			this.uiDialog.position( position );
+			if ( !isVisible ) {
+				this.uiDialog.hide();
+			}
 		}
-	};
+	});
 }
 
 }( jQuery ) );
-- 
cgit v1.2.3