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

[DE] Enable arrange for grouped shapes

Browse source
This commit is contained in:
Julia Radzhabova 2021-04-26 17:03:51 +03:00
parent c12aae8a0f
commit f3e7deb846
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -147,7 +147,7 @@ define([
disable.align = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked; disable.align = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked;
disable.group = 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.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);
if ( !disable.group ) { if ( !disable.group ) {

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

@ -2640,7 +2640,7 @@ define([
menuImageAlign.menu.items[7].setDisabled(objcount==2 && (!alignto || alignto==3)); menuImageAlign.menu.items[7].setDisabled(objcount==2 && (!alignto || alignto==3));
menuImageAlign.menu.items[8].setDisabled(objcount==2 && (!alignto || alignto==3)); menuImageAlign.menu.items[8].setDisabled(objcount==2 && (!alignto || alignto==3));
} }
menuImageArrange.setDisabled( wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked); menuImageArrange.setDisabled( (wrapping == Asc.c_oAscWrapStyle2.Inline) && !value.imgProps.value.get_FromGroup() || content_locked);
if (me.api) { if (me.api) {
mnuUnGroup.setDisabled(islocked || !me.api.CanUnGroup()); mnuUnGroup.setDisabled(islocked || !me.api.CanUnGroup());