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

[DE] Refactoring previous commit

Browse source
This commit is contained in:
Alexei Koshelev 2022-12-21 15:27:12 +03:00
parent 80fb58cd26
commit 5480210f83
2 changed files with 18 additions and 30 deletions
apps/documenteditor/main/app
controller
Toolbar.js
view
Toolbar.js

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

@ -855,9 +855,6 @@ define([
(lock_type===undefined) && (lock_type = Asc.c_oAscSdtLockType.Unlocked);
var content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked;
var if_form = control_props && control_props.get_FormPr();
var hasParagraphInForm = if_form && selectedObjects.some(function(item) {
return item.get_ObjectType() == Asc.c_oAscTypeSelectElement.Paragraph;
});
if (!toolbar.btnContentControls.isDisabled()) {
var control_disable = control_plain || content_locked;
@ -867,22 +864,12 @@ define([
toolbar.btnContentControls.menu.items[10].setDisabled(!in_control || if_form);
}
if (if_form && if_form.get_Fixed() && hasParagraphInForm) {
toolbar.btnAlignLeft.setDisabled(true);
toolbar.btnAlignCenter.setDisabled(true);
toolbar.btnAlignRight.setDisabled(true);
toolbar.btnAlignJust.setDisabled(true);
toolbar.btnMarkers.setDisabled(true);
toolbar.btnNumbers.setDisabled(true);
toolbar.btnMultilevels.setDisabled(true);
toolbar.btnDecLeftOffset.setDisabled(true);
toolbar.btnIncLeftOffset.setDisabled(true);
toolbar.btnLineSpace.setDisabled(true);
}
this.toolbar.lockToolbar(Common.enumLock.fixedForm, if_form && if_form.get_Fixed() && in_para, {array: [
toolbar.btnAlignLeft, toolbar.btnAlignCenter, toolbar.btnAlignRight, toolbar.btnAlignJust,
toolbar.btnMarkers, toolbar.btnNumbers, toolbar.btnMultilevels,
toolbar.btnDecLeftOffset, toolbar.btnIncLeftOffset,
toolbar.btnLineSpace
]});
this.toolbar.lockToolbar(Common.enumLock.controlPlain, control_plain, {array: [toolbar.btnInsertTable, toolbar.btnInsertImage, toolbar.btnInsertChart, toolbar.btnInsertText, toolbar.btnInsertTextArt,
toolbar.btnInsertShape, toolbar.btnInsertSmartArt, toolbar.btnInsertEquation, toolbar.btnDropCap, toolbar.btnColumns, toolbar.mnuInsertPageNum ]});
if (enable_dropcap && frame_pr) {

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

@ -116,7 +116,8 @@ define([
noObjectSelected: 'no-object',
lostConnect: 'disconnect',
disableOnStart: 'on-start',
complexForm: 'complex-form'
complexForm: 'complex-form',
fixedForm: 'fixed-form'
};
for (var key in enumLock) {
if (enumLock.hasOwnProperty(key)) {
@ -444,7 +445,7 @@ define([
id: 'id-toolbar-btn-align-left',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-align-left',
lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.fixedForm],
enableToggle: true,
toggleGroup: 'alignGroup',
dataHint: '1',
@ -456,7 +457,7 @@ define([
id: 'id-toolbar-btn-align-center',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-align-center',
lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.fixedForm],
enableToggle: true,
toggleGroup: 'alignGroup',
dataHint: '1',
@ -468,7 +469,7 @@ define([
id: 'id-toolbar-btn-align-right',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-align-right',
lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.fixedForm],
enableToggle: true,
toggleGroup: 'alignGroup',
dataHint: '1',
@ -480,7 +481,7 @@ define([
id: 'id-toolbar-btn-align-just',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-align-just',
lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.fixedForm],
enableToggle: true,
toggleGroup: 'alignGroup',
dataHint: '1',
@ -492,7 +493,7 @@ define([
id: 'id-toolbar-btn-decoffset',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-decoffset',
lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.fixedForm],
dataHint: '1',
dataHintDirection: 'top'
});
@ -502,7 +503,7 @@ define([
id: 'id-toolbar-btn-incoffset',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-incoffset',
lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.fixedForm],
dataHint: '1',
dataHintDirection: 'top'
});
@ -512,7 +513,7 @@ define([
id: 'id-toolbar-btn-linespace',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-linespace',
lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.fixedForm],
menu: new Common.UI.Menu({
style: 'min-width: 60px;',
items: [
@ -555,7 +556,7 @@ define([
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-setmarkers',
lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode,
_set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
_set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.fixedForm],
enableToggle: true,
toggleGroup: 'markersGroup',
split: true,
@ -572,7 +573,7 @@ define([
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-numbering',
lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode,
_set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
_set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.fixedForm],
enableToggle: true,
toggleGroup: 'markersGroup',
split: true,
@ -589,7 +590,7 @@ define([
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-multilevels',
lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode,
_set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
_set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.fixedForm],
menu: true,
dataHint: '1',
dataHintDirection: 'top',