Dialog: Updating dialog and tests for new button API

Author: arschmitz

tests/unit/dialog/dialog_options.js

@@ -153,21 +153,19 @@ 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
 				}
 			]
 		});
 
 	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.click();
 
 	element.remove();
@@ -208,17 +206,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();
 });

ui/dialog.js

@@ -406,10 +406,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 );
 
@@ -477,11 +475,13 @@ $.widget( "ui.dialog", {
 				click.apply( that.element[ 0 ], arguments );
 			};
 			buttonOptions = {
-				icons: props.icons,
-				text: props.showText
+				icon: props.icon,
+				iconPosition: props.iconPosition,
+				showLabel: props.showLabel
 			};
-			delete props.icons;
-			delete props.showText;
+			delete props.icon;
+			delete props.iconPosition;
+			delete props.showLabel;
 			$( "<button></button>", props )
 				.button( buttonOptions )
 				.appendTo( that.uiButtonSet );