diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-05-18 17:12:52 +0200 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-05-18 17:12:52 +0200 |
| commit | ba6dd5c1805c44998baf3413c7cd37cce9416c96 (patch) | |
| tree | d3e1c8cdb022d76ba7fd99a85424647af9a1c536 | |
| parent | 1c193085e1f6cb17319f59fc3e812c4963a82bcc (diff) | |
| parent | 4ff8d90a825f8335a4dbc8df2539fa08a3fe0add (diff) | |
| download | jquery-ui-ba6dd5c1805c44998baf3413c7cd37cce9416c96.tar.gz jquery-ui-ba6dd5c1805c44998baf3413c7cd37cce9416c96.zip | |
Merge branch 'master' of github.com:jquery/jquery-ui
| -rw-r--r-- | ui/jquery.ui.accordion.js | 6 | ||||
| -rw-r--r-- | ui/jquery.ui.button.js | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js index 0cc1f9e2a..c6b33befb 100644 --- a/ui/jquery.ui.accordion.js +++ b/ui/jquery.ui.accordion.js @@ -486,9 +486,11 @@ $.extend( $.ui.accordion, { $.each( fxAttrs, function( i, prop ) { hideProps[ prop ] = "hide"; - var parts = ( "" + $.css( options.toShow[0], prop ) ).match( /^([\d+-.]+)(.*)$/ ); + var parts = ( "" + $.css( options.toShow[0], prop ) ).match( /^([\d+-.]+)(.*)$/ ), + // work around bug when a panel has no height - #7335 + propVal = prop === "height" && parts[ 1 ] === "0" ? 1 : parts[ 1 ]; showProps[ prop ] = { - value: parts[ 1 ], + value: propVal, unit: parts[ 2 ] || "px" }; }); diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js index e5eedc3e5..a95dddc6c 100644 --- a/ui/jquery.ui.button.js +++ b/ui/jquery.ui.button.js @@ -17,13 +17,11 @@ var lastActive, startXPos, startYPos, clickDragged, baseClasses = "ui-button ui-widget ui-state-default ui-corner-all", stateClasses = "ui-state-hover ui-state-active ", typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only", - formResetHandler = function( event ) { - $( ":ui-button", event.target.form ).each(function() { - var inst = $( this ).data( "button" ); - setTimeout(function() { - inst.refresh(); - }, 1 ); - }); + formResetHandler = function() { + var buttons = $( this ).find( ":ui-button" ); + setTimeout(function() { + buttons.button( "refresh" ); + }, 1 ); }, radioGroup = function( radio ) { var name = radio.name, |