jQuery UI Development

Timestamp:

12/10/08 18:25:51 (12 months ago)

Author:

scott.gonzalez

Message:

Dialog: Fixed #3638: Added closeText option (default 'close').

Location:

trunk

Files:

• tests/dialog.js (modified) (2 diffs)
• ui/ui.dialog.js (modified) (3 diffs)

trunk/tests/dialog.js

@@ -11 +11 @@
         autoResize: true,
         buttons: {},
+        closeOnEscape: true,
+        closeText: 'close',
         disabled: false,
         dialogClass: undefined,
@@ -327 +329 @@
 });
 
+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);

trunk/ui/ui.dialog.js

@@ -64 +64 @@
 
                         uiDialogTitlebarCloseText = (this.uiDialogTitlebarCloseText = $('<span/>'))
-                                .html('X')
+                                .text(options.closeText)
                                 .appendTo(uiDialogTitlebarClose),
 
@@ -360 +360 @@
                                 this._createButtons(value);
                                 break;
+                        case "closeText":
+                                this.uiDialogTitlebarCloseText.text(value);
+                                break;
                         case "draggable":
                                 (value
@@ -419 +422 @@
                 buttons: {},
                 closeOnEscape: true,
+                closeText: 'close',
                 draggable: true,
                 height: 200,