From: Douglas Neiner Date: Wed, 2 Mar 2011 17:52:21 +0000 (-0500) Subject: Dialog: Added a class to dialog wrapper when it is currently displaying buttons,... X-Git-Tag: 1.9m5~235^2~7 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6008a30fcb8e59f040d290400cfbdb2e0cc96b01;p=jquery-ui.git 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 --- diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js index 82f28bf85..fb8dea775 100644 --- a/tests/unit/dialog/dialog_options.js +++ b/tests/unit/dialog/dialog_options.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(); }); diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index 0183dd801..493783896 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -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" ); } },