Skip to content
Permalink
Browse files

Dialog: Pass through icons and showText (as 'text') options to button…

…. Fixes #6830 - Allow Icons to be specified for Dialog buttons.
  • Loading branch information...
jzaefferer committed Nov 16, 2012
1 parent d8b98ec commit 999617343f7b813dc1c8d9c9048489e4d99d0470
Showing with 24 additions and 5 deletions.
  1. +8 −2 tests/unit/dialog/dialog_options.js
  2. +12 −1 tests/visual/dialog/complex-dialogs.html
  3. +4 −2 ui/jquery.ui.dialog.js
@@ -81,7 +81,7 @@ test("buttons", function() {
});

test("buttons - advanced", function() {
expect(5);
expect( 7 );

var buttons,
el = $("<div></div>").dialog({
@@ -92,7 +92,11 @@ test("buttons - advanced", function() {
id: "my-button-id",
click: function() {
equal(this, el[0], "correct context");
}
},
icons: {
primary: "ui-icon-cancel"
},
showText: false
}
]
});
@@ -102,6 +106,8 @@ test("buttons - advanced", function() {
equal(buttons.attr("id"), "my-button-id", "correct id");
equal(buttons.text(), "a button", "correct label");
ok(buttons.hasClass("additional-class"), "additional classes added");
deepEqual( buttons.button("option", "icons"), { primary: "ui-icon-cancel", secondary: null } );
equal( buttons.button( "option", "text" ), false );
buttons.click();

el.remove();
@@ -28,10 +28,21 @@
width: 500,
buttons: [
{
click: $.noop,
icons: {
primary: "ui-icon-check"
},
text: "Ok"
},
{
text: "Cancel"
click: function() {
$( this ).dialog( "close" );
},
icons: {
primary: "ui-icon-cancel"
},
text: "Cancel",
showText: false
}
]
}),
@@ -383,8 +383,10 @@ $.widget("ui.dialog", {
click.apply( that.element[0], arguments );
};
$( "<button></button>", props )
// TODO allow passing through button options
.button()
.button({
icons: props.icons,
text: props.showText
})
.appendTo( that.uiButtonSet );
});
this.uiDialog.addClass( "ui-dialog-buttons" );

0 comments on commit 9996173

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