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

Merge pull request #425 from ONLYOFFICE/fix/de-hide-additional-controls

Browse source 
[DE] Hide new content controls
This commit is contained in:
Julia Radzhabova 2020-07-20 17:34:39 +03:00 committed by GitHub
parent 56cf8b7653 79e6a3fd71
commit adc9826267
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -783,10 +783,10 @@ define([
toolbar.btnContentControls.setDisabled(paragraph_locked || header_locked); toolbar.btnContentControls.setDisabled(paragraph_locked || header_locked);
if (!(paragraph_locked || header_locked)) { if (!(paragraph_locked || header_locked)) {
var control_disable = control_plain || content_locked; var control_disable = control_plain || content_locked;
for (var i=0; i<14; i++) for (var i=0; i<7; i++)
toolbar.btnContentControls.menu.items[i].setDisabled(control_disable); toolbar.btnContentControls.menu.items[i].setDisabled(control_disable);
toolbar.btnContentControls.menu.items[15].setDisabled(!in_control || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked); toolbar.btnContentControls.menu.items[8].setDisabled(!in_control || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked);
toolbar.btnContentControls.menu.items[17].setDisabled(!in_control); toolbar.btnContentControls.menu.items[10].setDisabled(!in_control);
} }
var need_text_disable = paragraph_locked || header_locked || in_chart || rich_edit_lock || plain_edit_lock; var need_text_disable = paragraph_locked || header_locked || in_chart || rich_edit_lock || plain_edit_lock;

52
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -643,31 +643,31 @@ define([
value: 'checkbox' value: 'checkbox'
}, },
{caption: '--'}, {caption: '--'},
{ // {
caption: this.textNewFieldControl, // caption: this.textNewFieldControl,
value: 'new-field' // value: 'new-field'
}, // },
{ // {
caption: this.textNewPictureControl, // caption: this.textNewPictureControl,
value: 'new-picture' // value: 'new-picture'
}, // },
{ // {
caption: this.textNewComboboxControl, // caption: this.textNewComboboxControl,
value: 'new-combobox' // value: 'new-combobox'
}, // },
{ // {
caption: this.textNewDropdownControl, // caption: this.textNewDropdownControl,
value: 'new-dropdown' // value: 'new-dropdown'
}, // },
{ // {
caption: this.textNewCheckboxControl, // caption: this.textNewCheckboxControl,
value: 'new-checkbox' // value: 'new-checkbox'
}, // },
{ // {
caption: this.textNewRadioboxControl, // caption: this.textNewRadioboxControl,
value: 'new-radiobox' // value: 'new-radiobox'
}, // },
{caption: '--'}, // {caption: '--'},
{ {
caption: this.textRemoveControl, caption: this.textRemoveControl,
// iconCls: 'menu__icon cc-remove', // iconCls: 'menu__icon cc-remove',
@ -1982,7 +1982,7 @@ define([
this.btnMailRecepients.setVisible(mode.canCoAuthoring == true && mode.canUseMailMerge); this.btnMailRecepients.setVisible(mode.canCoAuthoring == true && mode.canUseMailMerge);
this.listStylesAdditionalMenuItem.setVisible(mode.canEditStyles); this.listStylesAdditionalMenuItem.setVisible(mode.canEditStyles);
this.btnContentControls.menu.items[17].setVisible(mode.canEditContentControl); this.btnContentControls.menu.items[10].setVisible(mode.canEditContentControl);
this.mnuInsertImage.items[2].setVisible(this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1); this.mnuInsertImage.items[2].setVisible(this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1);
}, },