diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 44d96d76d..480e6d114 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -792,10 +792,10 @@ define([ toolbar.btnContentControls.setDisabled(paragraph_locked || header_locked); if (!(paragraph_locked || header_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[15].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[8].setDisabled(!in_control || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked); + toolbar.btnContentControls.menu.items[10].setDisabled(!in_control); } var need_text_disable = paragraph_locked || header_locked || in_chart || rich_edit_lock || plain_edit_lock; diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index ede840dd5..518bd96d7 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -645,31 +645,31 @@ define([ value: 'checkbox' }, {caption: '--'}, - { - caption: this.textNewFieldControl, - value: 'new-field' - }, - { - caption: this.textNewPictureControl, - value: 'new-picture' - }, - { - caption: this.textNewComboboxControl, - value: 'new-combobox' - }, - { - caption: this.textNewDropdownControl, - value: 'new-dropdown' - }, - { - caption: this.textNewCheckboxControl, - value: 'new-checkbox' - }, - { - caption: this.textNewRadioboxControl, - value: 'new-radiobox' - }, - {caption: '--'}, + // { + // caption: this.textNewFieldControl, + // value: 'new-field' + // }, + // { + // caption: this.textNewPictureControl, + // value: 'new-picture' + // }, + // { + // caption: this.textNewComboboxControl, + // value: 'new-combobox' + // }, + // { + // caption: this.textNewDropdownControl, + // value: 'new-dropdown' + // }, + // { + // caption: this.textNewCheckboxControl, + // value: 'new-checkbox' + // }, + // { + // caption: this.textNewRadioboxControl, + // value: 'new-radiobox' + // }, + // {caption: '--'}, { caption: this.textRemoveControl, iconCls: 'menu__icon cc-remove', @@ -2041,7 +2041,7 @@ define([ this.btnMailRecepients.setVisible(mode.canCoAuthoring == true && mode.canUseMailMerge); 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); },