From 67d523edea21bed770a8b0910bd3f33cd5d08286 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 29 Jan 2020 14:12:29 +0300 Subject: [PATCH] [DE] Fix Bug 44173 (#321) --- apps/documenteditor/main/app/controller/PageLayout.js | 2 +- apps/documenteditor/main/app/view/DocumentHolder.js | 3 ++- apps/documenteditor/main/app/view/ImageSettings.js | 10 +++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/documenteditor/main/app/controller/PageLayout.js b/apps/documenteditor/main/app/controller/PageLayout.js index fde09878b1..6faf7b35be 100644 --- a/apps/documenteditor/main/app/controller/PageLayout.js +++ b/apps/documenteditor/main/app/controller/PageLayout.js @@ -147,7 +147,7 @@ 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 || content_locked; - disable.wrapping = islocked || props.get_FromGroup() || (notflow && !me.api.CanChangeWrapPolygon()) || content_locked; + disable.wrapping = islocked || props.get_FromGroup() || (notflow && !me.api.CanChangeWrapPolygon()) || content_locked || (!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture); if ( !disable.group ) { if (me.api.CanGroup() || me.api.CanUnGroup()) { diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index d9d899b728..9b54bec84f 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -2584,7 +2584,8 @@ define([ menuWrapPolygon.setDisabled(islocked || !me.api.CanChangeWrapPolygon()); } - me.menuImageWrap.setDisabled(islocked || value.imgProps.value.get_FromGroup() || (notflow && menuWrapPolygon.isDisabled())); + me.menuImageWrap.setDisabled(islocked || value.imgProps.value.get_FromGroup() || (notflow && menuWrapPolygon.isDisabled()) || + (!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture)); var cancopy = me.api && me.api.can_CopyCut(); menuImgCopy.setDisabled(!cancopy); diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js index 3be09ca9b9..67bf17eaf0 100644 --- a/apps/documenteditor/main/app/view/ImageSettings.js +++ b/apps/documenteditor/main/app/view/ImageSettings.js @@ -74,7 +74,8 @@ define([ FromGroup: false, DisabledControls: false, isOleObject: false, - cropMode: false + cropMode: false, + isPictureControl: false }; this.lockedControls = []; this._locked = false; @@ -308,10 +309,13 @@ define([ value = props.get_CanBeFlow() && !this._locked; var fromgroup = props.get_FromGroup() || this._locked; - if (this._state.CanBeFlow!==value || this._state.FromGroup!==fromgroup) { - this.cmbWrapType.setDisabled(!value || fromgroup); + 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; + if (this._state.CanBeFlow!==value || this._state.FromGroup!==fromgroup || this._state.isPictureControl!==isPictureControl) { + this.cmbWrapType.setDisabled(!value || fromgroup || isPictureControl); this._state.CanBeFlow=value; this._state.FromGroup=fromgroup; + this._state.isPictureControl=isPictureControl; } value = props.get_Width();