[DE] Fix Bug 44173 (#321)
This commit is contained in:
parent
b5d15fe4e7
commit
67d523edea
|
@ -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 || 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 ( !disable.group ) {
|
||||||
if (me.api.CanGroup() || me.api.CanUnGroup()) {
|
if (me.api.CanGroup() || me.api.CanUnGroup()) {
|
||||||
|
|
|
@ -2584,7 +2584,8 @@ define([
|
||||||
menuWrapPolygon.setDisabled(islocked || !me.api.CanChangeWrapPolygon());
|
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();
|
var cancopy = me.api && me.api.can_CopyCut();
|
||||||
menuImgCopy.setDisabled(!cancopy);
|
menuImgCopy.setDisabled(!cancopy);
|
||||||
|
|
|
@ -74,7 +74,8 @@ define([
|
||||||
FromGroup: false,
|
FromGroup: false,
|
||||||
DisabledControls: false,
|
DisabledControls: false,
|
||||||
isOleObject: false,
|
isOleObject: false,
|
||||||
cropMode: false
|
cropMode: false,
|
||||||
|
isPictureControl: false
|
||||||
};
|
};
|
||||||
this.lockedControls = [];
|
this.lockedControls = [];
|
||||||
this._locked = false;
|
this._locked = false;
|
||||||
|
@ -308,10 +309,13 @@ define([
|
||||||
|
|
||||||
value = props.get_CanBeFlow() && !this._locked;
|
value = props.get_CanBeFlow() && !this._locked;
|
||||||
var fromgroup = props.get_FromGroup() || this._locked;
|
var fromgroup = props.get_FromGroup() || this._locked;
|
||||||
if (this._state.CanBeFlow!==value || this._state.FromGroup!==fromgroup) {
|
var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null,
|
||||||
this.cmbWrapType.setDisabled(!value || fromgroup);
|
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.CanBeFlow=value;
|
||||||
this._state.FromGroup=fromgroup;
|
this._state.FromGroup=fromgroup;
|
||||||
|
this._state.isPictureControl=isPictureControl;
|
||||||
}
|
}
|
||||||
|
|
||||||
value = props.get_Width();
|
value = props.get_Width();
|
||||||
|
|
Loading…
Reference in a new issue