aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2012-11-05 09:37:01 -0500
committerScott González <scott.gonzalez@gmail.com>2012-11-05 09:37:19 -0500
commita8de99c791ae24e558920e1756fb7d0bf9dfc166 (patch)
treec5fbf80a469e19df516ae38dc48639aab86c94f1 /ui
parent1fe06f03fac30ce76b87eab8c5a9acc72becd587 (diff)
downloadjquery-ui-a8de99c791ae24e558920e1756fb7d0bf9dfc166.tar.gz
jquery-ui-a8de99c791ae24e558920e1756fb7d0bf9dfc166.zip
Dialog: Don't use .attr( props, true ).
Diffstat (limited to 'ui')
-rw-r--r--ui/jquery.ui.dialog.js15
1 files changed, 9 insertions, 6 deletions
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index dcf44580e..203618fc2 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -334,15 +334,18 @@ $.widget("ui.dialog", {
}
if ( hasButtons ) {
$.each( buttons, function( name, props ) {
+ var button, click;
props = $.isFunction( props ) ?
{ click: props, text: name } :
props;
- var button = $( "<button type='button'></button>" )
- .attr( props, true )
- .unbind( "click" )
- .click(function() {
- props.click.apply( that.element[0], arguments );
- })
+ // Default to a non-submitting button
+ props = $.extend( { type: "button" }, props );
+ // Change the context for the click callback to be the main element
+ click = props.click;
+ props.click = function() {
+ click.apply( that.element[0], arguments );
+ };
+ button = $( "<button></button>", props )
.appendTo( that.uiButtonSet );
if ( $.fn.button ) {
button.button();