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.widget.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.widget.js')
| -rw-r--r-- | ui/jquery.ui.widget.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js index c581e4b81..741ac74d7 100644 --- a/ui/jquery.ui.widget.js +++ b/ui/jquery.ui.widget.js @@ -178,6 +178,10 @@ $.widget.bridge = function( name, object ) { this.each(function() { var methodValue, instance = $.data( this, fullName ); + if ( options === "instance" ) { + returnValue = instance; + return false; + } if ( !instance ) { return $.error( "cannot call methods on " + name + " prior to initialization; " + "attempted to call method '" + options + "'" ); @@ -345,8 +349,7 @@ $.Widget.prototype = { if ( key === "disabled" ) { this.widget() - .toggleClass( this.widgetFullName + "-disabled ui-state-disabled", !!value ) - .attr( "aria-disabled", value ); + .toggleClass( this.widgetFullName + "-disabled", !!value ); this.hoverable.removeClass( "ui-state-hover" ); this.focusable.removeClass( "ui-state-focus" ); } |