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

Merge pull request #1536 from ONLYOFFICE/fix/form-in-table

Browse source 
[DE] Change "remove" menu item for forms
This commit is contained in:
Julia Radzhabova 2022-02-07 16:00:34 +03:00 committed by GitHub
parent 0dd2e4bc8f 1c6edcf780
commit 7fce35c7d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2983,12 +2983,18 @@ define([
}) })
}); });
var menuTableRemoveControl = new Common.UI.MenuItem({ var menuTableRemoveForm = new Common.UI.MenuItem({
iconCls: 'menu__icon cc-remove', iconCls: 'menu__icon cc-remove',
caption: me.textRemove, caption: me.textRemove,
value: 'remove' value: 'remove'
}).on('click', _.bind(me.onControlsSelect, me)); }).on('click', _.bind(me.onControlsSelect, me));
var menuTableRemoveControl = new Common.UI.MenuItem({
iconCls: 'menu__icon cc-remove',
caption: me.textRemoveControl,
value: 'remove'
}).on('click', _.bind(me.onControlsSelect, me));
var menuTableControlSettings = new Common.UI.MenuItem({ var menuTableControlSettings = new Common.UI.MenuItem({
caption: me.textSettings, caption: me.textSettings,
value: 'settings' value: 'settings'
@ -3438,18 +3444,25 @@ define([
!value.paraProps.value.can_DeleteInlineContentControl() || !value.paraProps.value.can_EditInlineContentControl()) : false; !value.paraProps.value.can_DeleteInlineContentControl() || !value.paraProps.value.can_EditInlineContentControl()) : false;
var in_toc = me.api.asc_GetTableOfContentsPr(true), var in_toc = me.api.asc_GetTableOfContentsPr(true),
in_control = !in_toc && me.api.asc_IsContentControl(); in_control = !in_toc && me.api.asc_IsContentControl();
menuTableControl.setVisible(in_control);
if (in_control) { if (in_control) {
var control_props = me.api.asc_GetContentControlProperties(), var control_props = me.api.asc_GetContentControlProperties(),
lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked, lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked,
is_form = control_props && control_props.get_FormPr(); is_form = control_props && control_props.get_FormPr();
menuTableRemoveControl.setDisabled(lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked); menuTableRemoveForm.setVisible(is_form);
menuTableRemoveControl.setCaption(is_form ? me.getControlLabel(control_props) : me.textRemoveControl); menuTableControl.setVisible(!is_form);
menuTableControlSettings.setVisible(me.mode.canEditContentControl && !is_form); if (is_form) {
menuTableRemoveForm.setDisabled(lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked);
menuTableRemoveForm.setCaption(me.getControlLabel(control_props));
} else {
menuTableRemoveControl.setDisabled(lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked);
menuTableControlSettings.setVisible(me.mode.canEditContentControl);
}
var spectype = control_props ? control_props.get_SpecificType() : Asc.c_oAscContentControlSpecificType.None; var spectype = control_props ? control_props.get_SpecificType() : Asc.c_oAscContentControlSpecificType.None;
control_lock = control_lock || spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.Picture || control_lock = control_lock || spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.Picture ||
spectype==Asc.c_oAscContentControlSpecificType.ComboBox || spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.DateTime; spectype==Asc.c_oAscContentControlSpecificType.ComboBox || spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.DateTime;
} else {
menuTableControl.setVisible(in_control);
menuTableRemoveForm.setVisible(in_control);
} }
menuTableTOC.setVisible(in_toc); menuTableTOC.setVisible(in_toc);
@ -3610,6 +3623,7 @@ define([
menuHyperlinkTable, menuHyperlinkTable,
menuTableFollow, menuTableFollow,
menuHyperlinkSeparator, menuHyperlinkSeparator,
menuTableRemoveForm,
menuTableControl, menuTableControl,
menuTableTOC, menuTableTOC,
menuParagraphAdvancedInTable menuParagraphAdvancedInTable