diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2010-08-27 18:02:11 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2010-08-27 18:02:11 -0400 |
| commit | 79ee6f0d7b94b71d89f30019e66a1746696d5608 (patch) | |
| tree | f8d7cdf363a80371ab0463e5b78f6d1c7ae89401 | |
| parent | af9864dcc439bf8d04f4ade248725cc217f66d56 (diff) | |
| download | jquery-ui-79ee6f0d7b94b71d89f30019e66a1746696d5608.tar.gz jquery-ui-79ee6f0d7b94b71d89f30019e66a1746696d5608.zip | |
Dialog: When using the title attribute, update the title option. Fixes #5877 - Dialog: when using the title attribute, the title option should be updated.
| -rw-r--r-- | tests/unit/dialog/dialog_options.js | 6 | ||||
| -rw-r--r-- | ui/jquery.ui.dialog.js | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js index fb6a28e12..d20f1d764 100644 --- a/tests/unit/dialog/dialog_options.js +++ b/tests/unit/dialog/dialog_options.js @@ -369,7 +369,7 @@ test("stack", function() { }); test("title", function() { - expect(5); + expect(9); function titleText() { return dlg().find(".ui-dialog-title").html(); @@ -377,18 +377,22 @@ test("title", function() { el = $('<div></div>').dialog(); equals(titleText(), " ", "[default]"); + equals(el.dialog("option", "title"), "", "option not changed"); el.remove(); el = $('<div title="foo"/>').dialog(); equals(titleText(), "foo", "title in element attribute"); + equals(el.dialog("option", "title"), "foo", "option updated from attribute"); el.remove(); el = $('<div></div>').dialog({ title: 'foo' }); equals(titleText(), "foo", "title in init options"); + equals(el.dialog("option", "title"), "foo", "opiton set from options hash"); el.remove(); el = $('<div title="foo"/>').dialog({ title: 'bar' }); equals(titleText(), "bar", "title in init options should override title in element attribute"); + equals(el.dialog("option", "title"), "bar", "opiton set from options hash"); el.remove(); el = $('<div></div>').dialog().dialog('option', 'title', 'foo'); diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index 1f3bd60f0..ff2375164 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -67,10 +67,11 @@ $.widget("ui.dialog", { this.originalTitle = ""; } + this.options.title = this.options.title || this.originalTitle; var self = this, options = self.options, - title = options.title || self.originalTitle || ' ', + title = options.title || ' ', titleId = $.ui.dialog.getTitleId(self.element), uiDialog = (self.uiDialog = $('<div></div>')) |