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

[SSE] Lock comments when selected not a cell for comment editor

Browse source
This commit is contained in:
Alexei Koshelev 2022-10-24 18:49:15 +03:00
parent db8816c05f
commit e9b04b91fb
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -2882,7 +2882,6 @@ define([
// info.asc_getComments()===null - has comment, but no permissions to view it // info.asc_getComments()===null - has comment, but no permissions to view it
toolbar.lockToolbar(Common.enumLock.commentLock, toolbar.lockToolbar(Common.enumLock.commentLock,
(selectionType == Asc.c_oAscSelectionType.RangeCells) && (!info.asc_getComments() || info.asc_getComments().length>0 || info.asc_getLocked()) (selectionType == Asc.c_oAscSelectionType.RangeCells) && (!info.asc_getComments() || info.asc_getComments().length>0 || info.asc_getLocked())
|| this.toolbar.mode.compatibleFeatures && (selectionType != Asc.c_oAscSelectionType.RangeCells)
|| selectionType != Asc.c_oAscSelectionType.RangeCells, || selectionType != Asc.c_oAscSelectionType.RangeCells,
{ array: this.btnsComment }); { array: this.btnsComment });
@ -3249,8 +3248,9 @@ define([
if (!this.appConfig.isRestrictedEdit) return; if (!this.appConfig.isRestrictedEdit) return;
var selectionType = info.asc_getSelectionType(); var selectionType = info.asc_getSelectionType();
this.toolbar.lockToolbar(Common.enumLock.commentLock, (selectionType == Asc.c_oAscSelectionType.RangeCells) && (!info.asc_getComments() || info.asc_getComments().length>0 || info.asc_getLocked()) || this.toolbar.lockToolbar(Common.enumLock.commentLock,
this.appConfig && this.appConfig.compatibleFeatures && (selectionType != Asc.c_oAscSelectionType.RangeCells), (selectionType == Asc.c_oAscSelectionType.RangeCells) && (!info.asc_getComments() || info.asc_getComments().length>0 || info.asc_getLocked())
|| selectionType != Asc.c_oAscSelectionType.RangeCells,
{ array: this.btnsComment }); { array: this.btnsComment });
this.toolbar.lockToolbar(Common.enumLock['Objects'], !!this._state.wsProps['Objects'], { array: this.btnsComment }); this.toolbar.lockToolbar(Common.enumLock['Objects'], !!this._state.wsProps['Objects'], { array: this.btnsComment });
}, },