From f405de5f3979d096d1aa073e5582f0e7523d9960 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 30 Dec 2021 14:49:19 +0300 Subject: [PATCH] [DE] Lock buttons in preview forms mode --- .../main/lib/controller/ReviewChanges.js | 24 +--- apps/common/main/lib/view/ReviewChanges.js | 49 ++----- apps/common/main/resources/less/toolbar.less | 10 +- .../main/app/controller/FormsTab.js | 8 +- .../main/app/controller/Main.js | 8 +- .../main/app/controller/PageLayout.js | 9 +- .../main/app/controller/Toolbar.js | 2 +- .../main/app/view/DocumentHolder.js | 10 +- apps/documenteditor/main/app/view/FormsTab.js | 14 +- apps/documenteditor/main/app/view/Links.js | 18 +-- .../main/app/view/MailMergeSettings.js | 2 +- .../main/app/view/SignatureSettings.js | 2 +- apps/documenteditor/main/app/view/Toolbar.js | 131 ++++++++++-------- 13 files changed, 127 insertions(+), 160 deletions(-) diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index ef65d1cc1..822fcb2a9 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -161,13 +161,13 @@ define([ this.document = data.doc; }, - SetDisabled: function(state, reviewMode, fillFormwMode) { + SetDisabled: function(state, reviewMode, fillFormMode) { if (this.dlgChanges) this.dlgChanges.close(); if (reviewMode) this.lockToolbar(Common.enumLock.previewReviewMode, state); - else if (fillFormwMode) - this.lockToolbar(Common.enumLock.fillFormwMode, state); + else if (fillFormMode) + this.lockToolbar(Common.enumLock.viewFormMode, state); else this.lockToolbar(Common.enumLock.viewMode, state); @@ -776,7 +776,7 @@ define([ Common.NotificationCenter.trigger('editing:disable', disable, { viewMode: false, reviewMode: true, - fillFormwMode: false, + fillFormMode: false, allowMerge: false, allowSignature: false, allowProtect: false, @@ -794,16 +794,6 @@ define([ plugins: true, protect: true }, 'review'); - - // if (this.view) { - // this.view.$el.find('.no-group-mask.review').css('opacity', 1); - // - // this.view.btnsDocLang && this.view.btnsDocLang.forEach(function(button) { - // if ( button ) { - // button.setDisabled(disable || !this.langs || this.langs.length<1); - // } - // }, this); - // } }, createToolbarPanel: function() { @@ -943,11 +933,6 @@ define([ setLanguages: function (array) { this.langs = array; this.lockToolbar(Common.enumLock.noSpellcheckLangs, this.langs.length<1, {array: this.view.btnsDocLang}); - // this.view && this.view.btnsDocLang && this.view.btnsDocLang.forEach(function(button) { - // if ( button ) { - // button.setDisabled(this.langs.length<1); - // } - // }, this); }, onDocLanguage: function() { @@ -1017,7 +1002,6 @@ define([ if (!item.asc_getView()) length++; }); - // this.view.btnCompare.setDisabled(length>1 || this.viewmode); Common.Utils.lockControls(Common.enumLock.hasCoeditingUsers, length>1, {array: [this.view.btnCompare]}); } }, diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index 309e8ce5e..22e0137de 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -259,7 +259,7 @@ define([ caption: this.txtAccept, split: !this.appConfig.canUseReviewPermissions, iconCls: 'toolbar__icon btn-review-save', - lock: [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.lostConnect], + lock: [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect], dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -271,7 +271,7 @@ define([ caption: this.txtReject, split: !this.appConfig.canUseReviewPermissions, iconCls: 'toolbar__icon btn-review-deny', - lock: [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.lostConnect], + lock: [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect], dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -284,7 +284,7 @@ define([ caption: this.txtCompare, split: true, iconCls: 'toolbar__icon btn-compare', - lock: [_set.hasCoeditingUsers, _set.previewReviewMode, _set.lostConnect], + lock: [_set.hasCoeditingUsers, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect], dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -294,7 +294,7 @@ define([ this.btnTurnOn = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-ic-review', - lock: [_set.previewReviewMode, _set.lostConnect], + lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect], caption: this.txtTurnon, split: !this.appConfig.isReviewOnly, enableToggle: true, @@ -309,7 +309,7 @@ define([ this.btnPrev = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-review-prev', - lock: [_set.previewReviewMode, _set.lostConnect], + lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect], caption: this.txtPrev, dataHint: '1', dataHintDirection: 'bottom', @@ -320,7 +320,7 @@ define([ this.btnNext = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-review-next', - lock: [_set.previewReviewMode, _set.lostConnect], + lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect], caption: this.txtNext, dataHint: '1', dataHintDirection: 'bottom', @@ -336,6 +336,7 @@ define([ this.btnReviewView = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-ic-reviewview', + lock: [_set.viewFormMode, _set.lostConnect], caption: this.txtView, menu: new Common.UI.Menu({ cls: 'ppm-toolbar', @@ -390,7 +391,7 @@ define([ this.btnSharing = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-ic-sharing', - lock: [_set.cantShare, _set.lostConnect], + lock: [_set.viewFormMode, _set.cantShare, _set.lostConnect], caption: this.txtSharing, dataHint: '1', dataHintDirection: 'bottom', @@ -403,7 +404,7 @@ define([ this.btnCoAuthMode = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-ic-coedit', - lock: [_set.lostConnect], + lock: [_set.viewFormMode, _set.lostConnect], caption: this.txtCoAuthMode, menu: true, dataHint: '1', @@ -449,7 +450,7 @@ define([ caption: this.txtCommentRemove, split: true, iconCls: 'toolbar__icon btn-rem-comment', - lock: [_set.previewReviewMode, _set.hideComments, _set['Objects'], _set.lostConnect], + lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect], dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -460,7 +461,7 @@ define([ caption: this.txtCommentResolve, split: true, iconCls: 'toolbar__icon btn-resolve-all', - lock: [_set.previewReviewMode, _set.hideComments, _set['Objects'], _set.lostConnect], + lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect], dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -730,7 +731,7 @@ define([ var button = new Common.UI.Button({ cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-ic-review', - lock: [Common.enumLock.viewMode, Common.enumLock.previewReviewMode, Common.enumLock.lostConnect], + lock: [Common.enumLock.viewMode, Common.enumLock.previewReviewMode, Common.enumLock.viewFormMode, Common.enumLock.lostConnect], hintAnchor : 'top', hint : this.tipReview, split : !this.appConfig.isReviewOnly, @@ -777,7 +778,7 @@ define([ button = new Common.UI.Button({ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-ic-docspell', - lock: [Common.enumLock.viewMode, Common.enumLock.previewReviewMode], + lock: [Common.enumLock.viewMode, Common.enumLock.viewFormMode, Common.enumLock.previewReviewMode], hintAnchor : 'top', hint: this.tipSetSpelling, enableToggle: true, @@ -793,7 +794,7 @@ define([ button = new Common.UI.Button({ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-ic-doclang', - lock: [Common.enumLock.viewMode, Common.enumLock.previewReviewMode, Common.enumLock.noSpellcheckLangs, Common.enumLock.lostConnect], + lock: [Common.enumLock.viewMode, Common.enumLock.previewReviewMode, Common.enumLock.viewFormMode, Common.enumLock.noSpellcheckLangs, Common.enumLock.lostConnect], hintAnchor : 'top', hint: this.tipSetDocLang, dataHint: '0', @@ -866,28 +867,6 @@ define([ } }, - SetDisabled: function (state, langs, protectProps) { - // this.btnsSpelling && this.btnsSpelling.forEach(function(button) { - // if ( button ) { - // button.setDisabled(state); - // } - // }, this); - // this.btnsDocLang && this.btnsDocLang.forEach(function(button) { - // if ( button ) { - // button.setDisabled(state || langs && langs.length<1); - // } - // }, this); - // this.btnsTurnReview && this.btnsTurnReview.forEach(function(button) { - // if ( button ) { - // button.setDisabled(state); - // } - // }, this); - // this.btnChat && this.btnChat.setDisabled(state); - - // this.btnCommentRemove && this.btnCommentRemove.setDisabled(state || !Common.Utils.InternalSettings.get(this.appPrefix + "settings-livecomment") || protectProps && protectProps.comments); - // this.btnCommentResolve && this.btnCommentResolve.setDisabled(state || !Common.Utils.InternalSettings.get(this.appPrefix + "settings-livecomment") || protectProps && protectProps.comments); - }, - onLostEditRights: function() { this._readonlyRights = true; }, diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 98208a7e1..b9a65a9b9 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -225,11 +225,11 @@ } } - &.no-group-mask { - .elset { - position: relative; - } - } + //&.no-group-mask { + // .elset { + // position: relative; + // } + //} } .elset { diff --git a/apps/documenteditor/main/app/controller/FormsTab.js b/apps/documenteditor/main/app/controller/FormsTab.js index 2fa3237c4..9d907a86a 100644 --- a/apps/documenteditor/main/app/controller/FormsTab.js +++ b/apps/documenteditor/main/app/controller/FormsTab.js @@ -295,7 +295,7 @@ define([ Common.NotificationCenter.trigger('editing:disable', disable, { viewMode: false, reviewMode: false, - fillFormwMode: true, + fillFormMode: true, allowMerge: false, allowSignature: false, allowProtect: false, @@ -310,11 +310,11 @@ define([ viewport: false, documentHolder: true, toolbar: true, - plugins: false, + plugins: true, protect: true }, 'forms'); - if (this.view) - this.view.$el.find('.no-group-mask.form-view').css('opacity', 1); + // if (this.view) + // this.view.$el.find('.no-group-mask.form-view').css('opacity', 1); } }, diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index ef448875b..9a23d41ea 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -736,7 +736,7 @@ define([ Common.NotificationCenter.trigger('editing:disable', disable, { viewMode: disable, reviewMode: false, - fillFormwMode: false, + fillFormMode: false, allowMerge: false, allowSignature: false, allowProtect: false, @@ -773,16 +773,16 @@ define([ app.getController('Statusbar').getView('Statusbar').SetDisabled(disable); } if (options.review) { - app.getController('Common.Controllers.ReviewChanges').SetDisabled(disable, options.reviewMode, options.fillFormwMode); + app.getController('Common.Controllers.ReviewChanges').SetDisabled(disable, options.reviewMode, options.fillFormMode); } if (options.viewport) { app.getController('Viewport').SetDisabled(disable); } if (options.toolbar) { - app.getController('Toolbar').DisableToolbar(disable, options.viewMode, options.reviewMode, options.fillFormwMode); + app.getController('Toolbar').DisableToolbar(disable, options.viewMode, options.reviewMode, options.fillFormMode); } if (options.documentHolder) { - app.getController('DocumentHolder').getView().SetDisabled(disable, options.allowProtect, options.fillFormwMode); + app.getController('DocumentHolder').getView().SetDisabled(disable, options.allowProtect, options.fillFormMode); } if (options.leftMenu) { if (options.leftMenu.disable) diff --git a/apps/documenteditor/main/app/controller/PageLayout.js b/apps/documenteditor/main/app/controller/PageLayout.js index 8f2a673d3..0148ad5ec 100644 --- a/apps/documenteditor/main/app/controller/PageLayout.js +++ b/apps/documenteditor/main/app/controller/PageLayout.js @@ -177,14 +177,7 @@ define([ }, onApiCoAuthoringDisconnect: function() { - var me = this; - me.editMode = false; - - // me.toolbar.btnImgAlign.setDisabled(true); - // me.toolbar.btnImgGroup.setDisabled(true); - // me.toolbar.btnImgForward.setDisabled(true); - // me.toolbar.btnImgBackward.setDisabled(true); - // me.toolbar.btnImgWrapping.setDisabled(true); + this.editMode = false; }, onBeforeShapeAlign: function() { diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 084c83acc..e7ef85be7 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -3049,7 +3049,7 @@ define([ if (reviewmode) this.toolbar.lockToolbar(Common.enumLock.previewReviewMode, disable); else if (fillformmode) - this.toolbar.lockToolbar(Common.enumLock.fillFormwMode, disable); + this.toolbar.lockToolbar(Common.enumLock.viewFormMode, disable); if(disable) { if (reviewmode || fillformmode) diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index a9b03c443..18d2ba15b 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -1616,7 +1616,7 @@ define([ : Common.util.Shortcuts.resumeEvents(hkComments); /** coauthoring end **/ this.editorConfig = {user: m.user}; - this._fillFormwMode = !this.mode.isEdit && this.mode.canFillForms; + this._fillFormMode = !this.mode.isEdit && this.mode.canFillForms; }; me.on('render:after', onAfterRender, me); @@ -2095,9 +2095,9 @@ define([ var disabled = value.paraProps && value.paraProps.locked === true; var cancopy = me.api && me.api.can_CopyCut(); menuViewCopy.setDisabled(!cancopy); - menuViewCut.setVisible(me._fillFormwMode && canEditControl); + menuViewCut.setVisible(me._fillFormMode && canEditControl); menuViewCut.setDisabled(disabled || !cancopy); - menuViewPaste.setVisible(me._fillFormwMode && canEditControl); + menuViewPaste.setVisible(me._fillFormMode && canEditControl); menuViewPaste.setDisabled(disabled); menuViewPrint.setVisible(me.mode.canPrint); menuViewPrint.setDisabled(!cancopy); @@ -4505,10 +4505,10 @@ define([ _.defer(function(){ me.cmpEl.focus(); }, 50); }, - SetDisabled: function(state, canProtect, fillFormwMode) { + SetDisabled: function(state, canProtect, fillFormMode) { this._isDisabled = state; this._canProtect = canProtect; - this._fillFormwMode = state ? fillFormwMode : false; + this._fillFormMode = state ? fillFormMode : false; }, alignmentText : 'Alignment', diff --git a/apps/documenteditor/main/app/view/FormsTab.js b/apps/documenteditor/main/app/view/FormsTab.js index 33d1d0ad0..9498a7b43 100644 --- a/apps/documenteditor/main/app/view/FormsTab.js +++ b/apps/documenteditor/main/app/view/FormsTab.js @@ -154,7 +154,7 @@ define([ this.btnTextField = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-text-field', - lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: this.capBtnText, dataHint: '1', dataHintDirection: 'bottom', @@ -165,7 +165,7 @@ define([ this.btnComboBox = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-combo-box', - lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: this.capBtnComboBox, dataHint: '1', dataHintDirection: 'bottom', @@ -176,7 +176,7 @@ define([ this.btnDropDown = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-dropdown', - lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: this.capBtnDropDown, dataHint: '1', dataHintDirection: 'bottom', @@ -187,7 +187,7 @@ define([ this.btnCheckBox = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-checkbox', - lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: this.capBtnCheckBox, dataHint: '1', dataHintDirection: 'bottom', @@ -198,7 +198,7 @@ define([ this.btnRadioBox = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-radio-button', - lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: this.capBtnRadioBox, dataHint: '1', dataHintDirection: 'bottom', @@ -209,7 +209,7 @@ define([ this.btnImageField = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-insertimage', - lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: this.capBtnImage, dataHint: '1', dataHintDirection: 'bottom', @@ -243,7 +243,7 @@ define([ this.btnHighlight = new Common.UI.ButtonColored({ cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-highlight', - lock: [ _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [ _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption : this.textHighlight, menu : true, additionalItems: [ this.mnuNoFormsColor = new Common.UI.MenuItem({ diff --git a/apps/documenteditor/main/app/view/Links.js b/apps/documenteditor/main/app/view/Links.js index 69f635dfb..346b7ab47 100644 --- a/apps/documenteditor/main/app/view/Links.js +++ b/apps/documenteditor/main/app/view/Links.js @@ -162,13 +162,13 @@ define([ $host = me.toolbar.$el; this.btnsContents = Common.Utils.injectButtons($host.find('.btn-slot.btn-contents'), '', 'toolbar__icon btn-contents', me.capBtnInsContents, - [_set.inHeader, _set.richEditLock, _set.plainEditLock, _set.richDelLock, _set.plainDelLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + [_set.inHeader, _set.richEditLock, _set.plainEditLock, _set.richDelLock, _set.plainDelLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], true, true, undefined, '1', 'bottom', 'small'); this.btnsNotes = Common.Utils.injectButtons($host.find('.btn-slot.slot-notes'), '', 'toolbar__icon btn-notes', me.capBtnInsFootnote, - [_set.paragraphLock, _set.inEquation, _set.inImage, _set.inHeader, _set.controlPlain, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + [_set.paragraphLock, _set.inEquation, _set.inImage, _set.inHeader, _set.controlPlain, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], true, true, undefined, '1', 'bottom', 'small'); this.btnsHyperlink = Common.Utils.injectButtons($host.find('.btn-slot.slot-inshyperlink'), '', 'toolbar__icon btn-inserthyperlink', me.capBtnInsLink, - [_set.paragraphLock, _set.headerLock, _set.hyperlinkLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + [_set.paragraphLock, _set.headerLock, _set.hyperlinkLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], undefined, undefined, undefined, '1', 'bottom', 'small'); Array.prototype.push.apply(this.paragraphControls, this.btnsContents.concat(this.btnsNotes, this.btnsHyperlink)); @@ -176,7 +176,7 @@ define([ parentEl: $host.find('#slot-btn-contents-update'), cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-update', - lock: [ _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [ _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: this.capBtnContentsUpdate, split: true, menu: true, @@ -190,7 +190,7 @@ define([ parentEl: $host.find('#slot-btn-bookmarks'), cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-bookmarks', - lock: [_set.paragraphLock, _set.inHeader, _set.headerLock, _set.controlPlain, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.inHeader, _set.headerLock, _set.controlPlain, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: this.capBtnBookmarks, dataHint: '1', dataHintDirection: 'bottom', @@ -202,7 +202,7 @@ define([ parentEl: $host.find('#slot-btn-caption'), cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-caption', - lock: [_set.inHeader, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.inHeader, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: this.capBtnCaption, dataHint: '1', dataHintDirection: 'bottom', @@ -214,7 +214,7 @@ define([ parentEl: $host.find('#slot-btn-crossref'), cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-cross-reference', - lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.richEditLock, _set.plainEditLock, _set.contentLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.richEditLock, _set.plainEditLock, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: this.capBtnCrossRef, dataHint: '1', dataHintDirection: 'bottom', @@ -226,7 +226,7 @@ define([ parentEl: $host.find('#slot-btn-tof'), cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-contents', - lock: [_set.inHeader, _set.richEditLock, _set.plainEditLock, _set.richDelLock, _set.plainDelLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.inHeader, _set.richEditLock, _set.plainEditLock, _set.richDelLock, _set.plainDelLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: this.capBtnTOF, dataHint: '1', dataHintDirection: 'left', @@ -238,7 +238,7 @@ define([ parentEl: $host.find('#slot-btn-tof-update'), cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-update', - lock: [_set.paragraphLock, _set.inHeader, _set.richEditLock, _set.plainEditLock, _set.richDelLock, _set.plainDelLock, _set.cantUpdateTOF, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.inHeader, _set.richEditLock, _set.plainEditLock, _set.richDelLock, _set.plainDelLock, _set.cantUpdateTOF, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: this.capBtnContentsUpdate, dataHint: '1', dataHintDirection: 'left', diff --git a/apps/documenteditor/main/app/view/MailMergeSettings.js b/apps/documenteditor/main/app/view/MailMergeSettings.js index ab4bbe6df..728f06278 100644 --- a/apps/documenteditor/main/app/view/MailMergeSettings.js +++ b/apps/documenteditor/main/app/view/MailMergeSettings.js @@ -840,7 +840,7 @@ define([ Common.NotificationCenter.trigger('editing:disable', disable, { viewMode: disable, reviewMode: false, - fillFormwMode: false, + fillFormMode: false, allowMerge: true, allowSignature: false, allowProtect: false, diff --git a/apps/documenteditor/main/app/view/SignatureSettings.js b/apps/documenteditor/main/app/view/SignatureSettings.js index 02601731f..407842107 100644 --- a/apps/documenteditor/main/app/view/SignatureSettings.js +++ b/apps/documenteditor/main/app/view/SignatureSettings.js @@ -396,7 +396,7 @@ define([ Common.NotificationCenter.trigger('editing:disable', disable, { viewMode: disable, reviewMode: false, - fillFormwMode: false, + fillFormMode: false, allowMerge: false, allowSignature: true, allowProtect: true, diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 73bddb21d..580c51f47 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -213,7 +213,7 @@ define([ id: 'id-toolbar-btn-undo', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-undo', - lock: [_set.undoLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.undoLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], signals: ['disabled'], dataHint: '1', dataHintDirection: 'bottom', @@ -225,7 +225,7 @@ define([ id: 'id-toolbar-btn-redo', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-redo', - lock: [_set.redoLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.redoLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], signals: ['disabled'], dataHint: '1', dataHintDirection: 'bottom', @@ -237,7 +237,7 @@ define([ id: 'id-toolbar-btn-copy', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-copy', - lock: [_set.copyLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.copyLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], dataHint: '1', dataHintDirection: 'top', dataHintTitle: 'C' @@ -248,7 +248,7 @@ define([ id: 'id-toolbar-btn-paste', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-paste', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], dataHint: '1', dataHintDirection: 'top', dataHintTitle: 'V' @@ -259,7 +259,7 @@ define([ id: 'id-toolbar-btn-incfont', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-incfont', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], dataHint: '1', dataHintDirection: 'top' }); @@ -269,7 +269,7 @@ define([ id: 'id-toolbar-btn-decfont', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-decfont', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], dataHint: '1', dataHintDirection: 'top' }); @@ -279,7 +279,7 @@ define([ id: 'id-toolbar-btn-bold', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-bold', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], enableToggle: true, dataHint: '1', dataHintDirection: 'bottom' @@ -290,7 +290,7 @@ define([ id: 'id-toolbar-btn-italic', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-italic', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], enableToggle: true, dataHint: '1', dataHintDirection: 'bottom' @@ -301,7 +301,7 @@ define([ id: 'id-toolbar-btn-underline', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-underline', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], enableToggle: true, dataHint: '1', dataHintDirection: 'bottom' @@ -312,7 +312,7 @@ define([ id: 'id-toolbar-btn-strikeout', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-strikeout', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], enableToggle: true, dataHint: '1', dataHintDirection: 'bottom' @@ -323,7 +323,7 @@ define([ id: 'id-toolbar-btn-superscript', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-superscript', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inEquation, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inEquation, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], enableToggle: true, toggleGroup: 'superscriptGroup', dataHint: '1', @@ -335,7 +335,7 @@ define([ id: 'id-toolbar-btn-subscript', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-subscript', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inEquation, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inEquation, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], enableToggle: true, toggleGroup: 'superscriptGroup', dataHint: '1', @@ -347,7 +347,8 @@ define([ id: 'id-toolbar-btn-highlight', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-highlight', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, + _set.lostConnect, _set.disableOnStart], enableToggle: true, allowDepress: true, split: true, @@ -373,7 +374,7 @@ define([ id: 'id-toolbar-btn-fontcolor', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-fontcolor', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], split: true, menu: true, auto: true, @@ -387,7 +388,8 @@ define([ id: 'id-toolbar-btn-paracolor', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-paracolor', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, + _set.lostConnect, _set.disableOnStart], split: true, transparent: true, menu: true, @@ -402,7 +404,7 @@ define([ id: 'id-toolbar-btn-case', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-change-case', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], menu: new Common.UI.Menu({ items: [ {caption: this.mniSentenceCase, value: Asc.c_oAscChangeTextCaseType.SentenceCase}, @@ -421,7 +423,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.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], enableToggle: true, toggleGroup: 'alignGroup', dataHint: '1', @@ -433,7 +435,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.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], enableToggle: true, toggleGroup: 'alignGroup', dataHint: '1', @@ -445,7 +447,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.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], enableToggle: true, toggleGroup: 'alignGroup', dataHint: '1', @@ -457,7 +459,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.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], enableToggle: true, toggleGroup: 'alignGroup', dataHint: '1', @@ -469,7 +471,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.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], dataHint: '1', dataHintDirection: 'top' }); @@ -479,7 +481,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.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], dataHint: '1', dataHintDirection: 'top' }); @@ -489,7 +491,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.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], menu: new Common.UI.Menu({ style: 'min-width: 60px;', items: [ @@ -511,7 +513,7 @@ define([ id: 'id-toolbar-btn-hidenchars', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-paragraph', - lock: [ _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [ _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], enableToggle: true, split: true, menu: new Common.UI.Menu({ @@ -531,7 +533,8 @@ define([ id: 'id-toolbar-btn-markers', 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.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, + _set.lostConnect, _set.disableOnStart], enableToggle: true, toggleGroup: 'markersGroup', split: true, @@ -547,7 +550,8 @@ define([ id: 'id-toolbar-btn-numbering', 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.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, + _set.lostConnect, _set.disableOnStart], enableToggle: true, toggleGroup: 'markersGroup', split: true, @@ -563,7 +567,8 @@ define([ id: 'id-toolbar-btn-multilevels', 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.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, + _set.lostConnect, _set.disableOnStart], menu: true, dataHint: '1', dataHintDirection: 'top', @@ -595,7 +600,8 @@ define([ id: 'tlbtn-inserttable', cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-inserttable', - lock: [_set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inEquation, _set.controlPlain, _set.richDelLock, _set.plainDelLock, _set.cantAddTable, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inEquation, _set.controlPlain, _set.richDelLock, _set.plainDelLock, _set.cantAddTable, _set.previewReviewMode, + _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capBtnInsTable, menu: new Common.UI.Menu({ items: [ @@ -617,7 +623,7 @@ define([ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-insertimage', lock: [_set.paragraphLock, _set.headerLock, _set.inEquation, _set.controlPlain, _set.richDelLock, _set.plainDelLock, _set.contentLock, _set.cantAddImagePara, - _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capBtnInsImage, menu: new Common.UI.Menu({ items: [ @@ -638,7 +644,7 @@ define([ caption: me.capBtnInsChart, iconCls: 'toolbar__icon btn-insertchart', lock: [ _set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.controlPlain, _set.richDelLock, _set.plainDelLock, _set.contentLock, - _set.chartLock, _set.cantAddChart, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + _set.chartLock, _set.cantAddChart, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], menu: true, dataHint: '1', dataHintDirection: 'bottom', @@ -650,7 +656,8 @@ define([ id: 'tlbtn-inserttext', cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-text', - lock: [_set.paragraphLock, _set.headerLock, _set.inEquation, _set.controlPlain, _set.contentLock, _set.inFootnote, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.inEquation, _set.controlPlain, _set.contentLock, _set.inFootnote, _set.previewReviewMode, _set.viewFormMode, + _set.lostConnect, _set.disableOnStart], caption: me.capBtnInsTextbox, enableToggle: true, dataHint: '1', @@ -664,7 +671,7 @@ define([ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-textart', lock: [_set.paragraphLock, _set.headerLock, _set.inEquation, _set.controlPlain, _set.richDelLock, _set.plainDelLock, _set.contentLock, _set.inFootnote, _set.cantAddImagePara, - _set.previewReviewMode,_set.lostConnect, _set.disableOnStart], + _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capBtnInsTextart, menu: new Common.UI.Menu({ cls: 'menu-shapes', @@ -682,7 +689,7 @@ define([ id: 'id-toolbar-btn-editheader', cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-editheader', - lock: [ _set.previewReviewMode, _set.inEquation, _set.lostConnect, _set.disableOnStart], + lock: [ _set.previewReviewMode, _set.viewFormMode, _set.inEquation, _set.lostConnect, _set.disableOnStart], caption: me.capBtnInsHeader, menu: true, dataHint: '1', @@ -716,7 +723,7 @@ define([ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-datetime', lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.richDelLock, _set.plainDelLock, _set.noParagraphSelected, _set.previewReviewMode, - _set.lostConnect, _set.disableOnStart], + _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capBtnDateTime, dataHint: '1', dataHintDirection: 'bottom', @@ -729,7 +736,7 @@ define([ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-blankpage', lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inEquation, _set.richDelLock, _set.plainDelLock, _set.inHeader, _set.inFootnote, _set.inControl, - _set.cantPageBreak, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + _set.cantPageBreak, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capBtnBlankPage, dataHint: '1', dataHintDirection: 'bottom', @@ -741,7 +748,8 @@ define([ id: 'tlbtn-insertshape', cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-insertshape', - lock: [_set.paragraphLock, _set.headerLock, _set.inEquation, _set.controlPlain, _set.contentLock, _set.inFootnote, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.inEquation, _set.controlPlain, _set.contentLock, _set.inFootnote, _set.previewReviewMode, _set.viewFormMode, + _set.lostConnect, _set.disableOnStart], caption: me.capBtnInsShape, enableToggle: true, menu: new Common.UI.Menu({cls: 'menu-shapes menu-insert-shape'}), @@ -756,7 +764,7 @@ define([ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-insertequation', lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.controlPlain, _set.richDelLock, _set.plainDelLock, _set.cantAddEquation, - _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capBtnInsEquation, split: true, menu: new Common.UI.Menu({cls: 'menu-shapes'}), @@ -771,7 +779,7 @@ define([ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-symbol', lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.richDelLock, _set.plainDelLock, _set.noParagraphSelected, _set.previewReviewMode, - _set.lostConnect, _set.disableOnStart], + _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capBtnInsSymbol, dataHint: '1', dataHintDirection: 'bottom', @@ -783,7 +791,8 @@ define([ id: 'tlbtn-dropcap', cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-dropcap', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inEquation, _set.controlPlain, _set.dropcapLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inEquation, _set.controlPlain, _set.dropcapLock, _set.previewReviewMode, _set.viewFormMode, + _set.lostConnect, _set.disableOnStart], caption: me.capBtnInsDropcap, menu: new Common.UI.Menu({ cls: 'ppm-toolbar shifted-right', @@ -827,7 +836,7 @@ define([ id: 'tlbtn-controls', cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-controls', - lock: [_set.paragraphLock, _set.headerLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capBtnInsControls, menu: new Common.UI.Menu({ cls: 'ppm-toolbar shifted-right', @@ -911,7 +920,8 @@ define([ id: 'tlbtn-columns', cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-columns', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.controlPlain, _set.inImage, _set.docPropsLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.controlPlain, _set.inImage, _set.docPropsLock, _set.previewReviewMode, _set.viewFormMode, + _set.lostConnect, _set.disableOnStart], caption: me.capBtnColumns, menu: new Common.UI.Menu({ cls: 'ppm-toolbar shifted-right', @@ -970,7 +980,7 @@ define([ id: 'tlbtn-pageorient', cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-pageorient', - lock: [_set.docPropsLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.docPropsLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capBtnPageOrient, menu: new Common.UI.Menu({ cls: 'ppm-toolbar', @@ -1012,7 +1022,7 @@ define([ id: 'tlbtn-pagemargins', cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-pagemargins', - lock: [_set.docPropsLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.docPropsLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capBtnMargins, menu: new Common.UI.Menu({ items: [ @@ -1075,7 +1085,7 @@ define([ id: 'tlbtn-pagesize', cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-pagesize', - lock: [_set.docPropsLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.docPropsLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capBtnPageSize, menu: new Common.UI.Menu({ restoreHeight: true, @@ -1199,7 +1209,7 @@ define([ id: 'tlbtn-line-numbers', cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-line-numbering', - lock: [_set.docPropsLock, _set.inImagePara, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.docPropsLock, _set.inImagePara, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capBtnLineNumbers, menu: new Common.UI.Menu({ cls: 'ppm-toolbar', @@ -1251,7 +1261,7 @@ define([ id: 'id-toolbar-btn-clearstyle', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-clearstyle', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], dataHint: '1', dataHintDirection: 'top' @@ -1262,7 +1272,7 @@ define([ id: 'id-toolbar-btn-copystyle', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-copystyle', - lock: [ _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [ _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], enableToggle: true, dataHint: '1', dataHintDirection: 'bottom' @@ -1273,7 +1283,7 @@ define([ id: 'id-toolbar-btn-colorschemas', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-colorschemas', - lock: [_set.docSchemaLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.docSchemaLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], menu: new Common.UI.Menu({ cls: 'shifted-left', items: [], @@ -1289,7 +1299,7 @@ define([ id: 'id-toolbar-btn-mailrecepients', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-mailmerge', - lock: [_set.mmergeLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.mmergeLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], dataHint: '1', dataHintDirection: 'bottom', menu: new Common.UI.Menu({ @@ -1305,7 +1315,7 @@ define([ me.btnImgAlign = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-img-align', - lock: [_set.imageLock, _set.contentLock, _set.inImageInline, _set.noObjectSelected, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.imageLock, _set.contentLock, _set.inImageInline, _set.noObjectSelected, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capImgAlign, menu: true, dataHint: '1', @@ -1316,7 +1326,7 @@ define([ me.btnImgGroup = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-img-group', - lock: [_set.imageLock, _set.contentLock, _set.inImageInline, _set.noObjectSelected, _set.cantGroup, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.imageLock, _set.contentLock, _set.inImageInline, _set.noObjectSelected, _set.cantGroup, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capImgGroup, menu: true, dataHint: '1', @@ -1326,7 +1336,7 @@ define([ me.btnImgForward = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-img-frwd', - lock: [_set.cantArrange, _set.lostConnect, _set.contentLock, _set.noObjectSelected, _set.inSmartartInternal, _set.previewReviewMode, _set.disableOnStart], + lock: [_set.cantArrange, _set.lostConnect, _set.contentLock, _set.noObjectSelected, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, _set.disableOnStart], caption: me.capImgForward, split: true, menu: true, @@ -1337,7 +1347,7 @@ define([ me.btnImgBackward = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-img-bkwd', - lock: [_set.cantArrange, _set.lostConnect, _set.contentLock, _set.noObjectSelected, _set.inSmartartInternal, _set.previewReviewMode, _set.disableOnStart], + lock: [_set.cantArrange, _set.lostConnect, _set.contentLock, _set.noObjectSelected, _set.inSmartartInternal, _set.previewReviewMode, _set.viewFormMode, _set.disableOnStart], caption: me.capImgBackward, split: true, menu: true, @@ -1348,7 +1358,7 @@ define([ me.btnImgWrapping = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-img-wrap', - lock: [_set.cantWrap, _set.imageLock, _set.contentLock, _set.noObjectSelected, _set.lostConnect, _set.previewReviewMode, _set.disableOnStart], + lock: [_set.cantWrap, _set.imageLock, _set.contentLock, _set.noObjectSelected, _set.lostConnect, _set.previewReviewMode, _set.viewFormMode, _set.disableOnStart], caption: me.capImgWrapping, menu: true, dataHint: '1', @@ -1359,7 +1369,7 @@ define([ me.btnWatermark = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-watermark', - lock: [_set.headerLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.headerLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capBtnWatermark, menu: new Common.UI.Menu({ cls: 'ppm-toolbar', @@ -1398,7 +1408,7 @@ define([ this.cmbFontSize = new Common.UI.ComboBox({ cls: 'input-group-nr', menuStyle: 'min-width: 55px;', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], hint: this.tipFontSize, data: [ {value: 8, displayValue: "8"}, @@ -1428,7 +1438,7 @@ define([ cls: 'input-group-nr', menuCls: 'scrollable-menu', menuStyle: 'min-width: 325px;', - lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.lostConnect, _set.disableOnStart], + lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], hint: this.tipFontName, store: new Common.Collections.Fonts(), dataHint: '1', @@ -1447,7 +1457,7 @@ define([ this.listStyles = new Common.UI.ComboDataView({ cls: 'combo-styles', lock: [_set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inChart, _set.inSmartart, _set.inSmartartInternal, _set.previewReviewMode, - _set.lostConnect, _set.disableOnStart], + _set.viewFormMode, _set.lostConnect, _set.disableOnStart], itemWidth: itemWidth, itemHeight: itemHeight, // hint : this.tipParagraphStyle, @@ -1693,8 +1703,9 @@ define([ _injectComponent('#slot-btn-watermark', this.btnWatermark); this.btnsPageBreak = Common.Utils.injectButtons($host.find('.btn-slot.btn-pagebreak'), '', 'toolbar__icon btn-pagebreak', this.capBtnInsPagebreak, - [Common.enumLock.paragraphLock, Common.enumLock.headerLock, Common.enumLock.richEditLock, Common.enumLock.plainEditLock, Common.enumLock.inEquation, Common.enumLock.richDelLock, Common.enumLock.plainDelLock, - Common.enumLock.inHeader, Common.enumLock.inFootnote, Common.enumLock.inControl, Common.enumLock.cantPageBreak, Common.enumLock.previewReviewMode, Common.enumLock.lostConnect, Common.enumLock.disableOnStart], + [Common.enumLock.paragraphLock, Common.enumLock.headerLock, Common.enumLock.richEditLock, Common.enumLock.plainEditLock, Common.enumLock.inEquation, Common.enumLock.richDelLock, + Common.enumLock.plainDelLock, Common.enumLock.inHeader, Common.enumLock.inFootnote, Common.enumLock.inControl, Common.enumLock.cantPageBreak, Common.enumLock.previewReviewMode, + Common.enumLock.viewFormMode, Common.enumLock.lostConnect, Common.enumLock.disableOnStart], true, true, undefined, '1', 'bottom', 'small'); Array.prototype.push.apply(this.paragraphControls, this.btnsPageBreak); Array.prototype.push.apply(this.lockControls, this.btnsPageBreak);