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

Merge pull request #1408 from ONLYOFFICE/fix/bugfix

Browse source 
[SSE] For  Bug 54487
This commit is contained in:
Julia Radzhabova 2021-12-11 13:57:05 +03:00 committed by GitHub
parent 9699804783 0167225fe7
commit 0266eb5723
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -1847,7 +1847,7 @@ define([
if (!documentHolder.copyPasteMenu || !showMenu && !documentHolder.copyPasteMenu.isVisible()) return;
if (showMenu) this.showPopupMenu(documentHolder.copyPasteMenu, {}, event);
} else if (isimagemenu || isshapemenu || ischartmenu) {
if (!documentHolder.imgMenu || !showMenu && !documentHolder.imgMenu.isVisible() || this._state.wsProps['Objects']) return;
if (!documentHolder.imgMenu || !showMenu && !documentHolder.imgMenu.isVisible()) return;
isimagemenu = isshapemenu = ischartmenu = isslicermenu = false;
documentHolder.mnuImgAdvanced.imageInfo = undefined;
@ -1859,6 +1859,10 @@ define([
if (selectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image) {
var elValue = selectedObjects[i].asc_getObjectValue();
isObjLocked = isObjLocked || elValue.asc_getLocked();
if (this._state.wsProps['Objects'] && elValue.asc_getProtectionLocked()) // don't show menu for locked shape
return;
var shapeprops = elValue.asc_getShapeProperties();
if (shapeprops) {
if (shapeprops.asc_getFromChart())
@ -1936,7 +1940,7 @@ define([
documentHolder.menuSignatureEditSetup.cmpEl.attr('data-value', signGuid); // edit signature settings
}
} else if (istextshapemenu || istextchartmenu) {
if (!documentHolder.textInShapeMenu || !showMenu && !documentHolder.textInShapeMenu.isVisible() || this._state.wsProps['Objects']) return;
if (!documentHolder.textInShapeMenu || !showMenu && !documentHolder.textInShapeMenu.isVisible()) return;
documentHolder.pmiTextAdvanced.textInfo = undefined;
@ -1950,6 +1954,10 @@ define([
align = value.asc_getVerticalTextAlign(),
direct = value.asc_getVert(),
listtype = this.api.asc_getCurrentListType();
if (this._state.wsProps['Objects'] && value.asc_getProtectionLockText()) // don't show menu for locked text
return;
isObjLocked = isObjLocked || value.asc_getLocked();
var cls = '';
switch (align) {