Skip to content
Permalink
Browse files

Dialog: Added a class to dialog wrapper when it is currently displayi…

…ng buttons, includes unit tests for changes. Fixed #7057 - An extra class is needed on the dialog wrapper to specify when a buttonset is showing
  • Loading branch information...
dcneiner authored and scottgonzalez committed Mar 2, 2011
1 parent 5c6afa8 commit 15c97e0b76b4576d0c7bee9d54dc4662c23502b9
Showing with 12 additions and 1 deletion.
  1. +9 −1 tests/unit/dialog/dialog_options.js
  2. +3 −0 ui/jquery.ui.dialog.js
@@ -18,7 +18,7 @@ test("autoOpen", function() {
});

test("buttons", function() {
expect(17);
expect(21);

var buttons = {
"Ok": function(ev, ui) {
@@ -44,6 +44,8 @@ test("buttons", function() {
});

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");

var newButtons = {
@@ -67,6 +69,12 @@ test("buttons", function() {
equals(btn.eq(i).text(), key, "text of button " + (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();
});
@@ -353,7 +353,10 @@ $.widget("ui.dialog", {
button.button();
}
});
self.uiDialog.addClass( "ui-dialog-buttons" );
uiDialogButtonPane.appendTo( self.uiDialog );
} else {
self.uiDialog.removeClass( "ui-dialog-buttons" );
}
},

0 comments on commit 15c97e0

Please sign in to comment.
You can’t perform that action at this time.