Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE] Bug 51187

Browse source
This commit is contained in:
Julia Radzhabova 2021-11-13 13:56:35 +03:00
parent f0d3467545
commit 00dfb687b2
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/controller/RightMenu.js
View file

@ -205,6 +205,8 @@ define([
this._settings[settingsType].props = control_props;
this._settings[settingsType].locked = control_lock;
this._settings[settingsType].hidden = 0;
if (control_props.get_FormPr().get_Fixed())
this._settings[Common.Utils.documentSettingsType.TextArt].hidden = 1;
}
}

15
apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
View file

@ -1385,14 +1385,21 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
var shapeprops = props.get_ShapeProperties();
var chartprops = props.get_ChartProperties();
var pluginGuid = props.asc_getPluginGuid();
var control_props = this.api && this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null,
fixed_size = false;
if (control_props) {
var spectype = control_props.get_SpecificType();
fixed_size = (spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.ComboBox ||
spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.None) &&
control_props.get_FormPr() && control_props.get_FormPr().get_Fixed();
}
this.btnOriginalSize.setVisible(!(shapeprops || chartprops));
this.btnOriginalSize.setDisabled(props.get_ImageUrl()===null || props.get_ImageUrl()===undefined);
this.btnsCategory[5].setVisible(shapeprops!==null && !shapeprops.get_FromChart()); // Shapes
this.btnsCategory[6].setVisible(shapeprops!==null && !shapeprops.get_FromChart()); // Margins
this.btnsCategory[5].setVisible(shapeprops!==null && !shapeprops.get_FromChart() && !fixed_size); // Shapes
this.btnsCategory[6].setVisible(shapeprops!==null && !shapeprops.get_FromChart() && !fixed_size); // Margins
this.btnsCategory[7].setVisible(!fixed_size); // Alt
this.btnsCategory[2].setVisible(!chartprops && (pluginGuid === null || pluginGuid === undefined)); // Rotation
var control_props = this.api && this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null;
this.btnsCategory[3].setDisabled(props.get_FromGroup() || !!control_props && (control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture)); // Wrapping
if (shapeprops) {