mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-11-21 11:04:24 +00:00
Merge branch 'master' of github.com:jquery/jquery-ui
This commit is contained in:
commit
ba6dd5c180
6
ui/jquery.ui.accordion.js
vendored
6
ui/jquery.ui.accordion.js
vendored
@ -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"
|
||||
};
|
||||
});
|
||||
|
12
ui/jquery.ui.button.js
vendored
12
ui/jquery.ui.button.js
vendored
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user