diff options
| author | Alexander Schmitz <arschmitz@gmail.com> | 2014-03-28 10:48:18 -0400 |
|---|---|---|
| committer | Alexander Schmitz <arschmitz@gmail.com> | 2015-10-07 10:57:59 -0400 |
| commit | 897ec38e6327393e8bac197a66e5c54bf883600f (patch) | |
| tree | 574d575016ba2cc78d9226e4f4d8fbf5dc9e0058 /ui/widgets/dialog.js | |
| parent | 40a9d1dfdb6a341904ae7bcd4600b0ef201d14df (diff) | |
| download | jquery-ui-897ec38e6327393e8bac197a66e5c54bf883600f.tar.gz jquery-ui-897ec38e6327393e8bac197a66e5c54bf883600f.zip | |
Dialog: Updating dialog and tests for new button API
Diffstat (limited to 'ui/widgets/dialog.js')
| -rw-r--r-- | ui/widgets/dialog.js | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ui/widgets/dialog.js b/ui/widgets/dialog.js index 6070014c9..b143d291e 100644 --- a/ui/widgets/dialog.js +++ b/ui/widgets/dialog.js @@ -427,10 +427,8 @@ $.widget( "ui.dialog", { this.uiDialogTitlebarClose = $( "<button type='button'></button>" ) .button( { label: this.options.closeText, - icons: { - primary: "ui-icon-closethick" - }, - text: false + icon: "ui-icon-closethick", + showLabel: false } ) .appendTo( this.uiDialogTitlebar ); @@ -498,12 +496,15 @@ $.widget( "ui.dialog", { // Change the context for the click callback to be the main element click = props.click; buttonOptions = { - icons: props.icons, - text: props.showText + icon: props.icon, + iconPosition: props.iconPosition, + showLabel: props.showLabel }; - delete props.icons; - delete props.showText; + delete props.click; + delete props.icon; + delete props.iconPosition; + delete props.showLabel; $( "<button></button>", props ) .button( buttonOptions ) |