library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dialog: Added a class to dialog wrapper when it is currently displaying buttons, includes unit tests for changes. Fixed #7057 - An extra class is needed on the dialog wrapper to specify when a buttonset is showing

Browse Source
This commit is contained in:
Douglas Neiner 2011-03-02 12:52:21 -05:00 committed by Scott González
parent 5c6afa8e7b
commit 15c97e0b76
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ test("autoOpen", function() {
}); });
test("buttons", function() { test("buttons", function() {
expect(17); expect(21);
var buttons = { var buttons = {
"Ok": function(ev, ui) { "Ok": function(ev, ui) {
@ -44,6 +44,8 @@ test("buttons", function() {
}); });
ok(btn.parent().hasClass('ui-dialog-buttonset'), "buttons in container"); ok(btn.parent().hasClass('ui-dialog-buttonset'), "buttons in container");
ok(el.parent().hasClass('ui-dialog-buttons'), "dialog wrapper adds class about having buttons");
btn.trigger("click"); btn.trigger("click");
var newButtons = { var newButtons = {
@ -68,6 +70,12 @@ test("buttons", function() {
i += 1; i += 1;
}); });
el.dialog("option", "buttons", null);
btn = $("button", dlg());
equals(btn.length, 0, "all buttons have been removed");
equals(el.find(".ui-dialog-buttonset").length, 0, "buttonset has been removed");
equals(el.parent().hasClass('ui-dialog-buttons'), false, "dialog wrapper removes class about having buttons");
el.remove(); el.remove();
}); });

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

@ -353,7 +353,10 @@ $.widget("ui.dialog", {
button.button(); button.button();
} }
}); });
self.uiDialog.addClass( "ui-dialog-buttons" );
uiDialogButtonPane.appendTo( self.uiDialog ); uiDialogButtonPane.appendTo( self.uiDialog );
} else {
self.uiDialog.removeClass( "ui-dialog-buttons" );
} }
}, },