From ec1f1bde76c555e7643899c5bbbb200353f780ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Zaefferer?= Date: Thu, 22 Nov 2012 10:39:45 +0100 Subject: [PATCH] Dialog: Follow-up to c77ca67 - exclude button options from properties to create the button. --- ui/jquery.ui.dialog.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index b9f73e954..ea5226ac5 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -376,7 +376,7 @@ $.widget("ui.dialog", { if ( !$.isEmptyObject( buttons ) ) { $.each( buttons, function( name, props ) { - var click; + var click, buttonOptions; props = $.isFunction( props ) ? { click: props, text: name } : props; @@ -387,11 +387,14 @@ $.widget("ui.dialog", { props.click = function() { click.apply( that.element[0], arguments ); }; + buttonOptions = { + icons: props.icons, + text: props.showText + }; + delete props.icons; + delete props.showText; $( "", props ) - .button({ - icons: props.icons, - text: props.showText - }) + .button( buttonOptions ) .appendTo( that.uiButtonSet ); }); this.uiDialog.addClass( "ui-dialog-buttons" );