зеркало из https://github.com/mozilla/pjs.git
fix bug #9753 for constrain not working properly with pixels/percent
This commit is contained in:
Родитель
aebdfd63a7
Коммит
dbbb5a1342
|
@ -318,9 +318,11 @@ function doDimensionEnabling( doEnable )
|
||||||
SetElementEnabledByID( "heightLabel", enable );
|
SetElementEnabledByID( "heightLabel", enable );
|
||||||
SetElementEnabledByID( "heightUnitsSelect", enable );
|
SetElementEnabledByID( "heightUnitsSelect", enable );
|
||||||
|
|
||||||
|
var constrainEnable = enable
|
||||||
SetElementEnabledByID( "constrainCheckbox", enable );
|
&& ( dialog.widthUnitsSelect.selectedIndex == 0 )
|
||||||
SetElementEnabledByID( "constrainLabel", enable );
|
&& ( dialog.heightUnitsSelect.selectedIndex == 0 );
|
||||||
|
SetElementEnabledByID( "constrainCheckbox", constrainEnable );
|
||||||
|
SetElementEnabledByID( "constrainLabel", constrainEnable );
|
||||||
}
|
}
|
||||||
|
|
||||||
function doOverallEnabling()
|
function doOverallEnabling()
|
||||||
|
@ -380,6 +382,7 @@ function constrainProportions( srcID, destID )
|
||||||
// now find out if we should be constraining or not
|
// now find out if we should be constraining or not
|
||||||
|
|
||||||
var constrainChecked = (dialog.constrainCheckbox.checked);
|
var constrainChecked = (dialog.constrainCheckbox.checked);
|
||||||
|
constrainChecked = constrainChecked && !dialog.constrainCheckbox.disabled;
|
||||||
if ( !constrainChecked )
|
if ( !constrainChecked )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче