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

[DE] Fix Bug 48094

Browse source
This commit is contained in:
Julia Radzhabova 2020-12-23 17:29:31 +03:00
parent 35b7ff277f
commit 240676e08e
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2515,6 +2515,21 @@ define([
}) })
}); });
var menuImgRemoveControl = new Common.UI.MenuItem({
iconCls: 'menu__icon cc-remove',
caption: me.textRemoveControl,
value: 'remove'
}).on('click', _.bind(me.onControlsSelect, me));
var menuImgControlSettings = new Common.UI.MenuItem({
caption: me.textEditControls,
value: 'settings'
}).on('click', _.bind(me.onControlsSelect, me));
var menuImgControlSeparator = new Common.UI.MenuItem({
caption : '--'
});
this.pictureMenu = new Common.UI.Menu({ this.pictureMenu = new Common.UI.Menu({
cls: 'shifted-right', cls: 'shifted-right',
initMenu: function(value){ initMenu: function(value){
@ -2589,9 +2604,19 @@ define([
me.menuOriginalSize.setVisible(value.imgProps.isOnlyImg || !value.imgProps.isChart && !value.imgProps.isShape); me.menuOriginalSize.setVisible(value.imgProps.isOnlyImg || !value.imgProps.isChart && !value.imgProps.isShape);
var control_props = me.api.asc_IsContentControl() ? me.api.asc_GetContentControlProperties() : null, var in_control = me.api.asc_IsContentControl(),
control_props = in_control ? me.api.asc_GetContentControlProperties() : null,
lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked, lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked,
content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked; content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked,
is_form = control_props && control_props.get_FormPr();
menuImgRemoveControl.setVisible(in_control);
menuImgControlSettings.setVisible(in_control && me.mode.canEditContentControl && !is_form);
menuImgControlSeparator.setVisible(in_control);
if (in_control) {
menuImgRemoveControl.setDisabled(lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked);
menuImgRemoveControl.setCaption(is_form ? me.getControlLabel(control_props) : me.textRemoveControl);
}
var islocked = value.imgProps.locked || (value.headerProps!==undefined && value.headerProps.locked) || content_locked; var islocked = value.imgProps.locked || (value.headerProps!==undefined && value.headerProps.locked) || content_locked;
var pluginGuid = value.imgProps.value.asc_getPluginGuid(); var pluginGuid = value.imgProps.value.asc_getPluginGuid();
@ -2611,7 +2636,7 @@ define([
if (menuChartEdit.isVisible()) if (menuChartEdit.isVisible())
menuChartEdit.setDisabled(islocked || value.imgProps.value.get_SeveralCharts()); menuChartEdit.setDisabled(islocked || value.imgProps.value.get_SeveralCharts());
me.pictureMenu.items[19].setVisible(menuChartEdit.isVisible()); me.pictureMenu.items[22].setVisible(menuChartEdit.isVisible());
me.menuOriginalSize.setDisabled(islocked || value.imgProps.value.get_ImageUrl()===null || value.imgProps.value.get_ImageUrl()===undefined); me.menuOriginalSize.setDisabled(islocked || value.imgProps.value.get_ImageUrl()===null || value.imgProps.value.get_ImageUrl()===undefined);
menuImageAdvanced.setDisabled(islocked); menuImageAdvanced.setDisabled(islocked);
@ -2660,6 +2685,9 @@ define([
menuSignatureEditSign, menuSignatureEditSign,
menuSignatureEditSetup, menuSignatureEditSetup,
menuEditSignSeparator, menuEditSignSeparator,
menuImgRemoveControl,
menuImgControlSettings,
menuImgControlSeparator,
menuImageArrange, menuImageArrange,
menuImageAlign, menuImageAlign,
me.menuImageWrap, me.menuImageWrap,