Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:jquery/jquery-ui

  • Loading branch information...
jzaefferer committed May 18, 2011
2 parents 1c19308 + 4ff8d90 commit ba6dd5c1805c44998baf3413c7cd37cce9416c96
Showing with 9 additions and 9 deletions.
  1. +4 −2 ui/jquery.ui.accordion.js
  2. +5 −7 ui/jquery.ui.button.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"
};
});
@@ -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,

0 comments on commit ba6dd5c

Please sign in to comment.
You can’t perform that action at this time.