pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

[PE] Slide master mode: lock comments

Browse Source
This commit is contained in:
Julia.Svinareva
2024-06-01 21:22:21 +03:00
parent ec3d37962d
commit 6700bb1d7b
5 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/common/main/lib/controller/ReviewChanges.js
View File

@ -95,6 +95,9 @@ define([
'reviewchange:reject': _.bind(this.onRejectClick, this),
'reviewchange:delete': _.bind(this.onDeleteClick, this),
'reviewchange:goto': _.bind(this.onGotoClick, this)
},
'ViewTab': {
'viewmode:change': _.bind(this.onChangeViewMode, this)
}
});
},
@ -1172,6 +1175,10 @@ define([
this.view && this.view.btnMailRecepients && Common.Utils.lockControls(Common.enumLock.mmergeLock, true, {array: [this.view.btnMailRecepients]});
},
onChangeViewMode: function (mode) {
this.lockToolbar(Common.enumLock.slideMasterMode, mode==='master');
},
textInserted: '<b>Inserted:</b>',
textDeleted: '<b>Deleted:</b>',
textParaInserted: '<b>Paragraph Inserted</b> ',

4
apps/common/main/lib/view/ReviewChanges.js
View File

@ -486,7 +486,7 @@ define([
caption: this.txtCommentRemove,
split: true,
iconCls: 'toolbar__icon btn-rem-comment',
lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect, _set.docLockView, _set.docLockForms, _set.viewMode],
lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect, _set.docLockView, _set.docLockForms, _set.viewMode, _set.slideMasterMode],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
@ -497,7 +497,7 @@ define([
caption: this.txtCommentResolve,
split: true,
iconCls: 'toolbar__icon btn-resolve-all',
lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect, _set.docLockView, _set.docLockForms, _set.viewMode],
lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect, _set.docLockView, _set.docLockForms, _set.viewMode, _set.slideMasterMode],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'

12
apps/presentationeditor/main/app/controller/LeftMenu.js
View File

@ -109,7 +109,8 @@ define([
'search:show': _.bind(this.onShowHideSearch, this)
},
'ViewTab': {
'leftmenu:hide': _.bind(this.onLeftMenuHide, this)
'leftmenu:hide': _.bind(this.onLeftMenuHide, this),
'viewmode:change': _.bind(this.onChangeViewMode, this)
}
});
Common.NotificationCenter.on('leftmenu:change', _.bind(this.onMenuChange, this));
@ -830,6 +831,15 @@ define([
this.clickMenuFileItem(null, 'print');
},
onChangeViewMode: function (mode) {
if (mode === 'master') {
if (this.leftMenu.btnComments && this.leftMenu.btnComments.pressed) {
this.leftMenu.close();
}
}
this.leftMenu.btnComments.setDisabled(mode === 'master');
},
textNoTextFound : 'Text not found',
newDocumentTitle : 'Unnamed document',
requestEditRightsText : 'Requesting editing rights...',

4
apps/presentationeditor/main/app/controller/Toolbar.js
View File

@ -2820,7 +2820,7 @@ define([
this.btnsComment = [];
if ( config.canCoAuthoring && config.canComments ) {
var _set = Common.enumLock;
this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-add-comment', me.toolbar.capBtnComment, [_set.lostConnect, _set.noSlides], undefined, undefined, undefined, '1', 'bottom', 'small');
this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-add-comment', me.toolbar.capBtnComment, [_set.lostConnect, _set.noSlides, _set.slideMasterMode], undefined, undefined, undefined, '1', 'bottom', 'small');
if ( this.btnsComment.length ) {
var _comments = PE.getController('Common.Controllers.Comments').getView();
@ -2966,6 +2966,8 @@ define([
onChangeViewMode: function (mode) { // master or normal
this.toolbar.$el.find('.master-slide-mode')[mode==='master'?'show':'hide']();
this.toolbar.$el.find('.normal-mode')[mode==='normal'?'show':'hide']();
this.toolbar.lockToolbar(Common.enumLock.slideMasterMode, mode==='master', { array: this.btnsComment });
mode==='master' && this.toolbar.setTab('ins');
},

2
apps/presentationeditor/main/app/view/Toolbar.js
View File

@ -103,6 +103,8 @@ define([
copyLock: 'can-copy',
fileMenuOpened: 'file-menu-opened',
noParagraphObject: 'no-paragraph-obj',
inSlideMaster: 'in-slide-master',
slideMasterMode: 'slide-master-mode'
};
for (var key in enumLock) {
if (enumLock.hasOwnProperty(key)) {