From 897ec38e6327393e8bac197a66e5c54bf883600f Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Fri, 28 Mar 2014 10:48:18 -0400
Subject: [PATCH] Dialog: Updating dialog and tests for new button API

---
 tests/unit/dialog/options.js | 18 ++++++++----------
 ui/widgets/dialog.js         | 17 +++++++++--------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/tests/unit/dialog/options.js b/tests/unit/dialog/options.js
index 7565799c4..5aa958756 100644
--- a/tests/unit/dialog/options.js
+++ b/tests/unit/dialog/options.js
@@ -156,10 +156,8 @@ test( "buttons - advanced", function( assert ) {
 					click: function() {
 						equal( this, element[ 0 ], "correct context" );
 					},
-					icons: {
-						primary: "ui-icon-cancel"
-					},
-					showText: false
+					icon: "ui-icon-cancel",
+					showLabel: false
 				}
 			]
 		} );
@@ -167,10 +165,10 @@ test( "buttons - advanced", function( assert ) {
 	buttons = element.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" );
+	equal( buttons.text(), " a button", "correct label" );
 	assert.hasClasses( buttons, "additional-class" );
-	deepEqual( buttons.button( "option", "icons" ), { primary: "ui-icon-cancel", secondary: null } );
-	equal( buttons.button( "option", "text" ), false );
+	deepEqual( buttons.button( "option", "icon" ), "ui-icon-cancel" );
+	equal( buttons.button( "option", "showLabel" ), false );
 	buttons.trigger( "click" );
 
 	element.remove();
@@ -211,17 +209,17 @@ test( "closeText", function() {
 	expect( 3 );
 
 	var element = $( "<div></div>" ).dialog();
-		equal( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close span" ).text(), "Close",
+		equal( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).text(), " Close",
 			"default close text" );
 	element.remove();
 
 	element = $( "<div></div>" ).dialog( { closeText: "foo" } );
-		equal( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close span" ).text(), "foo",
+		equal( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).text(), " foo",
 			"closeText on init" );
 	element.remove();
 
 	element = $( "<div></div>" ).dialog().dialog( "option", "closeText", "bar" );
-		equal( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close span" ).text(), "bar",
+		equal( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).text(), " bar",
 			"closeText via option method" );
 	element.remove();
 } );
diff --git a/ui/widgets/dialog.js b/ui/widgets/dialog.js
index 6070014c9..b143d291e 100644
--- a/ui/widgets/dialog.js
+++ b/ui/widgets/dialog.js
@@ -427,10 +427,8 @@ $.widget( "ui.dialog", {
 		this.uiDialogTitlebarClose = $( "<button type='button'></button>" )
 			.button( {
 				label: this.options.closeText,
-				icons: {
-					primary: "ui-icon-closethick"
-				},
-				text: false
+				icon: "ui-icon-closethick",
+				showLabel: false
 			} )
 			.appendTo( this.uiDialogTitlebar );
 
@@ -498,12 +496,15 @@ $.widget( "ui.dialog", {
 			// Change the context for the click callback to be the main element
 			click = props.click;
 			buttonOptions = {
-				icons: props.icons,
-				text: props.showText
+				icon: props.icon,
+				iconPosition: props.iconPosition,
+				showLabel: props.showLabel
 			};
-			delete props.icons;
-			delete props.showText;
+
 			delete props.click;
+			delete props.icon;
+			delete props.iconPosition;
+			delete props.showLabel;
 
 			$( "<button></button>", props )
 				.button( buttonOptions )
-- 
2.39.5