diff options
| author | gnarf <gnarf@gnarf.net> | 2011-05-10 16:16:34 -0500 |
|---|---|---|
| committer | gnarf <gnarf@gnarf.net> | 2011-05-10 16:16:34 -0500 |
| commit | 27a7deebf299e1673e8b452476be02e486bba2c6 (patch) | |
| tree | 79521a78ab770ebd7ee167575b680f14d3ed4089 /ui/jquery.ui.button.js | |
| parent | 4dcfeee8d54d81db4d5af8b2fd189b799cd9561e (diff) | |
| parent | 85ac420a1e4281ee7f361e847d3cad72fa58525e (diff) | |
| download | jquery-ui-27a7deebf299e1673e8b452476be02e486bba2c6.tar.gz jquery-ui-27a7deebf299e1673e8b452476be02e486bba2c6.zip | |
Merge branch 'master' into effects-unit
Conflicts:
ui/jquery.effects.pulsate.js
Diffstat (limited to 'ui/jquery.ui.button.js')
| -rw-r--r-- | ui/jquery.ui.button.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js index 5777d4753..031ac2091 100644 --- a/ui/jquery.ui.button.js +++ b/ui/jquery.ui.button.js @@ -103,6 +103,11 @@ $.widget( "ui.button", { }) .bind( "blur.button", function() { $( this ).removeClass( focusClass ); + }) + .bind( "click.button", function( event ) { + if ( options.disabled ) { + event.stopImmediatePropagation(); + } }); if ( toggleButton ) { |