library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Dialog: When using the title attribute, update the title option. Fixes #5877 - Dialog: when using the title attribute, the title option should be updated.

Browse Source
This commit is contained in:
Scott González 2010-08-27 18:02:11 -04:00
parent af9864dcc4
commit 79ee6f0d7b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/unit/dialog/dialog_options.js
View File

@ -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(), "&nbsp;", "[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');

3
ui/jquery.ui.dialog.js vendored
View File

@ -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 || '&#160;',
title = options.title || '&#160;',
titleId = $.ui.dialog.getTitleId(self.element),
uiDialog = (self.uiDialog = $('<div></div>'))