Skip to content

Commit 5eab9fa

Browse files
committed
Dialog: Updating dialog and tests for new button API
1 parent fde58ad commit 5eab9fa

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

tests/unit/dialog/dialog_options.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,8 @@ test("buttons - advanced", function( assert ) {
153153
click: function() {
154154
equal(this, element[0], "correct context");
155155
},
156-
icons: {
157-
primary: "ui-icon-cancel"
158-
},
159-
showText: false
156+
icon: "ui-icon-cancel",
157+
showLabel: false
160158
}
161159
]
162160
});
@@ -166,8 +164,8 @@ test("buttons - advanced", function( assert ) {
166164
equal(buttons.attr("id"), "my-button-id", "correct id");
167165
equal(buttons.text(), "a button", "correct label");
168166
assert.hasClasses( buttons, "additional-class" );
169-
deepEqual( buttons.button("option", "icons"), { primary: "ui-icon-cancel", secondary: null } );
170-
equal( buttons.button( "option", "text" ), false );
167+
deepEqual( buttons.button("option", "icon"), "ui-icon-cancel" );
168+
equal( buttons.button( "option", "showLabel" ), false );
171169
buttons.click();
172170

173171
element.remove();
@@ -208,17 +206,17 @@ test("closeText", function() {
208206
expect(3);
209207

210208
var element = $("<div></div>").dialog();
211-
equal(element.dialog("widget").find(".ui-dialog-titlebar-close span").text(), "Close",
209+
equal(element.dialog("widget").find(".ui-dialog-titlebar-close").text(), "Close",
212210
"default close text");
213211
element.remove();
214212

215213
element = $("<div></div>").dialog({ closeText: "foo" });
216-
equal(element.dialog("widget").find(".ui-dialog-titlebar-close span").text(), "foo",
214+
equal(element.dialog("widget").find(".ui-dialog-titlebar-close").text(), "foo",
217215
"closeText on init");
218216
element.remove();
219217

220218
element = $("<div></div>").dialog().dialog("option", "closeText", "bar");
221-
equal(element.dialog("widget").find(".ui-dialog-titlebar-close span").text(), "bar",
219+
equal(element.dialog("widget").find(".ui-dialog-titlebar-close").text(), "bar",
222220
"closeText via option method");
223221
element.remove();
224222
});

ui/dialog.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -413,10 +413,8 @@ $.widget( "ui.dialog", {
413413
this.uiDialogTitlebarClose = $( "<button type='button'></button>" )
414414
.button({
415415
label: this.options.closeText,
416-
icons: {
417-
primary: "ui-icon-closethick"
418-
},
419-
text: false
416+
icon: "ui-icon-closethick",
417+
showLabel: false
420418
})
421419
.appendTo( this.uiDialogTitlebar );
422420

@@ -484,11 +482,13 @@ $.widget( "ui.dialog", {
484482
click.apply( that.element[ 0 ], arguments );
485483
};
486484
buttonOptions = {
487-
icons: props.icons,
488-
text: props.showText
485+
icon: props.icon,
486+
showLabel: props.showLabel,
487+
iconPosition: props.iconPosition
489488
};
490-
delete props.icons;
491-
delete props.showText;
489+
delete props.icon;
490+
delete props.showLabel;
491+
delete props.iconPosition;
492492
$( "<button></button>", props )
493493
.button( buttonOptions )
494494
.appendTo( that.uiButtonSet );

0 commit comments

Comments
 (0)