diff options
| author | Felix Nagel <info@felixnagel.com> | 2013-03-19 19:59:31 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2013-03-19 19:59:31 +0100 |
| commit | 1ce8d87f8bee3b1ec8698e0e2b8ead726d0d4ca2 (patch) | |
| tree | 77edf8d66ab74aa11b86c286ba2a528b4d3c36de /ui/jquery.ui.button.js | |
| parent | 5a9a80f86cc7844e7357af834c61cc14431110d1 (diff) | |
| parent | 1c1f7c6184ba6f6a13e93960ea77c293f9d4308e (diff) | |
| download | jquery-ui-1ce8d87f8bee3b1ec8698e0e2b8ead726d0d4ca2.tar.gz jquery-ui-1ce8d87f8bee3b1ec8698e0e2b8ead726d0d4ca2.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.button.js')
| -rw-r--r-- | ui/jquery.ui.button.js | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js index fcb7b14d1..5e64f5164 100644 --- a/ui/jquery.ui.button.js +++ b/ui/jquery.ui.button.js @@ -207,9 +207,6 @@ $.widget( "ui.button", { } } - // TODO: pull out $.Widget's handling for the disabled option into - // $.Widget.prototype._setOptionDisabled so it's easy to proxy and can - // be overridden by individual plugins this._setOption( "disabled", options.disabled ); this._resetButton(); }, @@ -273,11 +270,8 @@ $.widget( "ui.button", { _setOption: function( key, value ) { this._super( key, value ); if ( key === "disabled" ) { - if ( value ) { - this.element.prop( "disabled", true ); - } else { - this.element.prop( "disabled", false ); - } + this.widget().toggleClass( "ui-state-disabled", !!value ); + this.element.prop( "disabled", !!value ); return; } this._resetButton(); |