diff --git a/apps/pdfeditor/main/app/controller/Toolbar.js b/apps/pdfeditor/main/app/controller/Toolbar.js index 553a64837a..ec097a9ab2 100644 --- a/apps/pdfeditor/main/app/controller/Toolbar.js +++ b/apps/pdfeditor/main/app/controller/Toolbar.js @@ -573,7 +573,8 @@ define([ page_rotate = false, page_edit_text = false, in_form = false, - text_form = false; + in_check_form = false, + in_text_form = false; while (++i < selectedObjects.length) { type = selectedObjects[i].get_ObjectType(); @@ -624,9 +625,9 @@ define([ } else if (type == Asc.c_oAscTypeSelectElement.Field) { let ft = pr.asc_getType(); in_form = true; - if (ft !== AscPDF.FIELD_TYPES.checkbox && ft !== AscPDF.FIELD_TYPES.radiobutton) - no_text = false; - text_form = ft===AscPDF.FIELD_TYPES.text || ft===AscPDF.FIELD_TYPES.combobox || ft===AscPDF.FIELD_TYPES.listbox; + no_text = false; + in_text_form = ft===AscPDF.FIELD_TYPES.text || ft===AscPDF.FIELD_TYPES.combobox || ft===AscPDF.FIELD_TYPES.listbox; + in_check_form = ft===AscPDF.FIELD_TYPES.checkbox || ft===AscPDF.FIELD_TYPES.radiobutton; } } @@ -657,9 +658,14 @@ define([ toolbar.lockToolbar(Common.enumLock.inForm, in_form, {array: toolbar.paragraphControls}); } - let cant_align = no_paragraph && !text_form; + if (this._state.in_check_form !== in_check_form) { + if (this._state.activated) this._state.in_check_form = in_check_form; + toolbar.lockToolbar(Common.enumLock.inCheckForm, in_check_form, {array: toolbar.paragraphControls}); + } + + let cant_align = no_paragraph && !in_text_form; toolbar.lockToolbar(Common.enumLock.cantAlign, cant_align, {array: [toolbar.btnHorizontalAlign]}); - !cant_align && toolbar.btnHorizontalAlign.menu.items[3].setDisabled(text_form); + !cant_align && toolbar.btnHorizontalAlign.menu.items[3].setDisabled(in_text_form); if (this._state.no_object !== no_object ) { if (this._state.activated) this._state.no_object = no_object; diff --git a/apps/pdfeditor/main/app/view/Toolbar.js b/apps/pdfeditor/main/app/view/Toolbar.js index 8cdcc83ae5..cafb160599 100644 --- a/apps/pdfeditor/main/app/view/Toolbar.js +++ b/apps/pdfeditor/main/app/view/Toolbar.js @@ -100,6 +100,7 @@ define([ pageDeleted: 'page-deleted', pageEditText: 'page-edit-text', inForm: 'in-form', + inCheckForm: 'in-check-form', cantAlign: 'cant-align' }; for (var key in enumLock) { @@ -163,7 +164,7 @@ define([ menuCls: 'scrollable-menu', menuStyle: 'min-width: 325px;', hint: this.tipFontName, - lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart], + lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inCheckForm, _set.shapeLock, _set.disableOnStart], store: new Common.Collections.Fonts(), dataHint: '1', dataHintDirection: 'top' @@ -175,7 +176,7 @@ define([ cls: 'input-group-nr', menuStyle: 'min-width: 55px;', hint: this.tipFontSize, - lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart], + lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inCheckForm, _set.shapeLock, _set.disableOnStart], data: [ {value: 8, displayValue: "8"}, {value: 9, displayValue: "9"}, @@ -205,7 +206,7 @@ define([ id: 'id-toolbar-btn-incfont', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-incfont', - lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart], + lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inCheckForm, _set.shapeLock, _set.disableOnStart], dataHint: '1', dataHintDirection: 'top' }); @@ -216,7 +217,7 @@ define([ id: 'id-toolbar-btn-decfont', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-decfont', - lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart], + lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.inCheckForm, _set.shapeLock, _set.disableOnStart], dataHint: '1', dataHintDirection: 'top' });