From db8816c05fbe2ec990621d5728e44d760e31cd7d Mon Sep 17 00:00:00 2001
From: Alexei Koshelev <aleksei.koshelev@onlyoffice.com>
Date: Sat, 22 Oct 2022 21:33:14 +0300
Subject: [PATCH] [SSE] Lock comments when selected not a cell
---
apps/spreadsheeteditor/main/app/controller/Toolbar.js | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index ef1487620..8568d7865 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -2879,6 +2879,13 @@ define([
toolbar.lockToolbar(Common.enumLock['Objects'], !!this._state.wsProps['Objects']);
toolbar.lockToolbar(Common.enumLock['FormatCells'], !!this._state.wsProps['FormatCells']);
+ // info.asc_getComments()===null - has comment, but no permissions to view it
+ toolbar.lockToolbar(Common.enumLock.commentLock,
+ (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,
+ { array: this.btnsComment });
+
if (editOptionsDisabled) return;
/* read font params */
@@ -3234,10 +3241,6 @@ define([
}
toolbar.lockToolbar(Common.enumLock.itemsDisabled, !enabled, {array: [toolbar.btnDeleteCell]});
- // info.asc_getComments()===null - has comment, but no permissions to view it
- toolbar.lockToolbar(Common.enumLock.commentLock, (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),
- { array: this.btnsComment });
toolbar.lockToolbar(Common.enumLock.headerLock, info.asc_getLockedHeaderFooter(), {array: this.toolbar.btnsEditHeader});
},