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

[DE] For Bug 44173: disable wrapping only for picture content controls (not forms, Bug 54218)

Browse source
This commit is contained in:
Julia Radzhabova 2021-12-01 23:24:03 +03:00
parent d9d367810f
commit e4c94a6bfe
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/documenteditor/main/app/controller/PageLayout.js
View file

@ -148,7 +148,8 @@ define([
disable.align = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked;
disable.group = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked;
disable.arrange = (wrapping == Asc.c_oAscWrapStyle2.Inline) && !props.get_FromGroup() || content_locked;
disable.wrapping = islocked || props.get_FromGroup() || (notflow && !me.api.CanChangeWrapPolygon()) || content_locked || (!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture);
disable.wrapping = islocked || props.get_FromGroup() || (notflow && !me.api.CanChangeWrapPolygon()) || content_locked ||
(!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture && !control_props.get_FormPr());
if ( !disable.group ) {
if (me.api.CanGroup() || me.api.CanUnGroup()) {

2
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -2676,7 +2676,7 @@ define([
}
me.menuImageWrap.setDisabled(islocked || value.imgProps.value.get_FromGroup() || (notflow && menuWrapPolygon.isDisabled()) ||
(!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture));
(!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture && !control_props.get_FormPr()));
var cancopy = me.api && me.api.can_CopyCut();
menuImgCopy.setDisabled(!cancopy);

2
apps/documenteditor/main/app/view/ImageSettings.js
View file

@ -338,7 +338,7 @@ define([
value = props.get_CanBeFlow() && !this._locked;
var fromgroup = props.get_FromGroup() || this._locked;
var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null,
isPictureControl = !!control_props && (control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture) || this._locked;
isPictureControl = !!control_props && (control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture) && !control_props.get_FormPr() || this._locked;
if (this._state.CanBeFlow!==value || this._state.FromGroup!==fromgroup || this._state.isPictureControl!==isPictureControl) {
this.cmbWrapType.setDisabled(!value || fromgroup || isPictureControl);
this._state.CanBeFlow=value;

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

@ -1401,7 +1401,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
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
this.btnsCategory[3].setDisabled(props.get_FromGroup() || !!control_props && (control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture)); // Wrapping
this.btnsCategory[3].setDisabled(props.get_FromGroup() || !!control_props && (control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture) && !control_props.get_FormPr()); // Wrapping
if (shapeprops) {
this._objectType = Asc.c_oAscTypeSelectElement.Shape;