r1090 - in trunk: tests ui
Author: scott.gonzalez
Date: Wed Dec 10 18:25:51 2008
New Revision: 1090
Modified:
trunk/tests/dialog.js
trunk/ui/ui.dialog.js
Log:
Dialog: Fixed #3638: Added closeText option (default 'close').
Modified: trunk/tests/dialog.js
==============================================================================
--- trunk/tests/dialog.js (original)
+++ trunk/tests/dialog.js Wed Dec 10 18:25:51 2008
@@ -10,6 +10,8 @@
autoOpen: true,
autoResize: true,
buttons: {},
+ closeOnEscape: true,
+ closeText: 'close',
disabled: false,
dialogClass: undefined,
draggable: true,
@@ -323,6 +325,29 @@
i += 1;
});
+ 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();
});
Modified: trunk/ui/ui.dialog.js
==============================================================================
--- trunk/ui/ui.dialog.js (original)
+++ trunk/ui/ui.dialog.js Wed Dec 10 18:25:51 2008
@@ -63,7 +63,7 @@
.appendTo(uiDialogTitlebar),
uiDialogTitlebarCloseText = (this.uiDialogTitlebarCloseText =
$('<span/>'))
- .html('X')
+ .text(options.closeText)
.appendTo(uiDialogTitlebarClose),
title = options.title || ' ',
@@ -359,6 +359,9 @@
case "buttons":
this._createButtons(value);
break;
+ case "closeText":
+ this.uiDialogTitlebarCloseText.text(value);
+ break;
case "draggable":
(value
? this._makeDraggable()
@@ -418,6 +421,7 @@
bgiframe: false,
buttons: {},
closeOnEscape: true,
+ closeText: 'close',
draggable: true,
height: 200,
minHeight: 100,