diff options
| author | Felix Nagel <info@felixnagel.com> | 2013-07-26 19:28:03 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2013-07-26 19:28:03 +0200 |
| commit | 34e10c1f876e7747482b2ca68f35038a7b8c9ac4 (patch) | |
| tree | e2275a847f6ed349a0e2c9f1f3ef1efad141c231 /ui | |
| parent | e217c402875153ea74a26c266bb36665f82b1cbb (diff) | |
| parent | 9470af0bbefafa3d81c3709674a45a54b693e7cf (diff) | |
| download | jquery-ui-34e10c1f876e7747482b2ca68f35038a7b8c9ac4.tar.gz jquery-ui-34e10c1f876e7747482b2ca68f35038a7b8c9ac4.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/jquery.ui.accordion.js | 4 | ||||
| -rw-r--r-- | ui/jquery.ui.widget.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js index 3b515e314..26a9ce94f 100644 --- a/ui/jquery.ui.accordion.js +++ b/ui/jquery.ui.accordion.js @@ -99,7 +99,7 @@ $.widget( "ui.accordion", { // clean up headers this.headers - .removeClass( "ui-accordion-header ui-accordion-header-active ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top" ) + .removeClass( "ui-accordion-header ui-accordion-header-active ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top" ) .removeAttr( "role" ) .removeAttr( "aria-selected" ) .removeAttr( "aria-controls" ) @@ -247,7 +247,7 @@ $.widget( "ui.accordion", { _processPanels: function() { this.headers = this.element.find( this.options.header ) - .addClass( "ui-accordion-header ui-helper-reset ui-state-default ui-corner-all" ); + .addClass( "ui-accordion-header ui-state-default ui-corner-all" ); this.headers.next() .addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" ) diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js index 958f62e55..93daaf1ca 100644 --- a/ui/jquery.ui.widget.js +++ b/ui/jquery.ui.widget.js @@ -355,10 +355,10 @@ $.Widget.prototype = { }, enable: function() { - return this._setOption( "disabled", false ); + return this._setOptions({ disabled: false }); }, disable: function() { - return this._setOption( "disabled", true ); + return this._setOptions({ disabled: true }); }, _on: function( suppressDisabledCheck, element, handlers ) { |