mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-11-21 11:04:24 +00:00
Dialog: Fixed #3638: Added closeText option (default 'close').
This commit is contained in:
parent
06ed0691cf
commit
9eda8e4cb9
@ -10,6 +10,8 @@ var defaults = {
|
||||
autoOpen: true,
|
||||
autoResize: true,
|
||||
buttons: {},
|
||||
closeOnEscape: true,
|
||||
closeText: 'close',
|
||||
disabled: false,
|
||||
dialogClass: undefined,
|
||||
draggable: true,
|
||||
@ -326,6 +328,29 @@ test("buttons", function() {
|
||||
el.remove();
|
||||
});
|
||||
|
||||
test("closeOnEscape", function() {
|
||||
ok(false, 'missing test');
|
||||
});
|
||||
|
||||
test("closeText", function() {
|
||||
expect(3);
|
||||
|
||||
el = $('<div></div>').dialog();
|
||||
equals(dlg().find('.ui-dialog-titlebar-close span').text(), 'close',
|
||||
'default close text');
|
||||
el.remove();
|
||||
|
||||
el = $('<div></div>').dialog({ closeText: "foo" });
|
||||
equals(dlg().find('.ui-dialog-titlebar-close span').text(), 'foo',
|
||||
'closeText on init');
|
||||
el.remove();
|
||||
|
||||
el = $('<div></div>').dialog().dialog('option', 'closeText', 'bar');
|
||||
equals(dlg().find('.ui-dialog-titlebar-close span').text(), 'bar',
|
||||
'closeText via option method');
|
||||
el.remove();
|
||||
});
|
||||
|
||||
test("dialogClass", function() {
|
||||
expect(4);
|
||||
|
||||
|
@ -63,7 +63,7 @@ $.widget("ui.dialog", {
|
||||
.appendTo(uiDialogTitlebar),
|
||||
|
||||
uiDialogTitlebarCloseText = (this.uiDialogTitlebarCloseText = $('<span/>'))
|
||||
.html('X')
|
||||
.text(options.closeText)
|
||||
.appendTo(uiDialogTitlebarClose),
|
||||
|
||||
title = options.title || ' ',
|
||||
@ -359,6 +359,9 @@ $.widget("ui.dialog", {
|
||||
case "buttons":
|
||||
this._createButtons(value);
|
||||
break;
|
||||
case "closeText":
|
||||
this.uiDialogTitlebarCloseText.text(value);
|
||||
break;
|
||||
case "draggable":
|
||||
(value
|
||||
? this._makeDraggable()
|
||||
@ -418,6 +421,7 @@ $.extend($.ui.dialog, {
|
||||
bgiframe: false,
|
||||
buttons: {},
|
||||
closeOnEscape: true,
|
||||
closeText: 'close',
|
||||
draggable: true,
|
||||
height: 200,
|
||||
minHeight: 100,
|
||||
|
Loading…
Reference in New Issue
Block a user