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

[SSE] Fix Bug 35922.

Browse source
This commit is contained in:
Julia Radzhabova 2017-09-28 16:56:10 +03:00
parent 161bd0ee3d
commit 837e507381
1 changed files with 22 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1242,26 +1242,18 @@ define([
isTableLocked = cellinfo.asc_getLockedTable()===true, isTableLocked = cellinfo.asc_getLockedTable()===true,
isObjLocked = false, isObjLocked = false,
commentsController = this.getApplication().getController('Common.Controllers.Comments'), commentsController = this.getApplication().getController('Common.Controllers.Comments'),
insfunc = false, internaleditor = this.permissions.isEditMailMerge || this.permissions.isEditDiagram;
cansort = false;
if (this.permissions.isEditMailMerge) { switch (seltype) {
cansort = (seltype==Asc.c_oAscSelectionType.RangeCells); case Asc.c_oAscSelectionType.RangeCells: iscellmenu = true; break;
} else if (this.permissions.isEditDiagram) { case Asc.c_oAscSelectionType.RangeRow: isrowmenu = true; break;
insfunc = (seltype==Asc.c_oAscSelectionType.RangeCells); case Asc.c_oAscSelectionType.RangeCol: iscolmenu = true; break;
} case Asc.c_oAscSelectionType.RangeMax: isallmenu = true; break;
else { case Asc.c_oAscSelectionType.RangeImage: isimagemenu = !internaleditor; break;
switch (seltype) { case Asc.c_oAscSelectionType.RangeShape: isshapemenu = !internaleditor; break;
case Asc.c_oAscSelectionType.RangeCells: iscellmenu = true; break; case Asc.c_oAscSelectionType.RangeChart: ischartmenu = !internaleditor; break;
case Asc.c_oAscSelectionType.RangeRow: isrowmenu = true; break; case Asc.c_oAscSelectionType.RangeChartText:istextchartmenu = !internaleditor; break;
case Asc.c_oAscSelectionType.RangeCol: iscolmenu = true; break; case Asc.c_oAscSelectionType.RangeShapeText: istextshapemenu = !internaleditor; break;
case Asc.c_oAscSelectionType.RangeMax: isallmenu = true; break;
case Asc.c_oAscSelectionType.RangeImage: isimagemenu = true; break;
case Asc.c_oAscSelectionType.RangeShape: isshapemenu = true; break;
case Asc.c_oAscSelectionType.RangeChart: ischartmenu = true; break;
case Asc.c_oAscSelectionType.RangeChartText:istextchartmenu = true; break;
case Asc.c_oAscSelectionType.RangeShapeText: istextshapemenu = true; break;
}
} }
if (isimagemenu || isshapemenu || ischartmenu) { if (isimagemenu || isshapemenu || ischartmenu) {
@ -1389,12 +1381,14 @@ define([
documentHolder.pmiInsertTable.setVisible(iscellmenu && !iscelledit && isintable); documentHolder.pmiInsertTable.setVisible(iscellmenu && !iscelledit && isintable);
documentHolder.pmiDeleteTable.setVisible(iscellmenu && !iscelledit && isintable); documentHolder.pmiDeleteTable.setVisible(iscellmenu && !iscelledit && isintable);
documentHolder.pmiSparklines.setVisible(isinsparkline); documentHolder.pmiSparklines.setVisible(isinsparkline);
documentHolder.pmiSortCells.setVisible((iscellmenu||isallmenu||cansort) && !iscelledit); documentHolder.pmiSortCells.setVisible((iscellmenu||isallmenu) && !iscelledit);
documentHolder.pmiFilterCells.setVisible((iscellmenu||cansort) && !iscelledit); documentHolder.pmiSortCells.menu.items[2].setVisible(!internaleditor);
documentHolder.pmiReapply.setVisible((iscellmenu||isallmenu||cansort) && !iscelledit); documentHolder.pmiSortCells.menu.items[3].setVisible(!internaleditor);
documentHolder.ssMenu.items[12].setVisible((iscellmenu||isallmenu||cansort||isinsparkline) && !iscelledit); documentHolder.pmiFilterCells.setVisible(iscellmenu && !iscelledit && !internaleditor);
documentHolder.pmiInsFunction.setVisible(iscellmenu||insfunc); documentHolder.pmiReapply.setVisible((iscellmenu||isallmenu) && !iscelledit && !internaleditor);
documentHolder.pmiAddNamedRange.setVisible(iscellmenu && !iscelledit); documentHolder.ssMenu.items[12].setVisible((iscellmenu||isallmenu||isinsparkline) && !iscelledit);
documentHolder.pmiInsFunction.setVisible(iscellmenu);
documentHolder.pmiAddNamedRange.setVisible(iscellmenu && !iscelledit && !internaleditor);
if (isintable) { if (isintable) {
documentHolder.pmiInsertTable.menu.items[0].setDisabled(!formatTableInfo.asc_getIsInsertRowAbove()); documentHolder.pmiInsertTable.menu.items[0].setDisabled(!formatTableInfo.asc_getIsInsertRowAbove());
@ -1409,8 +1403,8 @@ define([
} }
var hyperinfo = cellinfo.asc_getHyperlink(); var hyperinfo = cellinfo.asc_getHyperlink();
documentHolder.menuHyperlink.setVisible(iscellmenu && hyperinfo && !iscelledit && !ismultiselect); documentHolder.menuHyperlink.setVisible(iscellmenu && hyperinfo && !iscelledit && !ismultiselect && !internaleditor);
documentHolder.menuAddHyperlink.setVisible(iscellmenu && !hyperinfo && !iscelledit && !ismultiselect); documentHolder.menuAddHyperlink.setVisible(iscellmenu && !hyperinfo && !iscelledit && !ismultiselect && !internaleditor);
documentHolder.pmiRowHeight.setVisible(isrowmenu||isallmenu); documentHolder.pmiRowHeight.setVisible(isrowmenu||isallmenu);
documentHolder.pmiColumnWidth.setVisible(iscolmenu||isallmenu); documentHolder.pmiColumnWidth.setVisible(iscolmenu||isallmenu);
@ -1424,7 +1418,7 @@ define([
documentHolder.ssMenu.items[17].setVisible(iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments); documentHolder.ssMenu.items[17].setVisible(iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments);
documentHolder.pmiAddComment.setVisible(iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments); documentHolder.pmiAddComment.setVisible(iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments);
/** coauthoring end **/ /** coauthoring end **/
documentHolder.pmiCellMenuSeparator.setVisible(iscellmenu || isrowmenu || iscolmenu || isallmenu || insfunc); documentHolder.pmiCellMenuSeparator.setVisible(iscellmenu || isrowmenu || iscolmenu || isallmenu);
documentHolder.pmiEntireHide.isrowmenu = isrowmenu; documentHolder.pmiEntireHide.isrowmenu = isrowmenu;
documentHolder.pmiEntireShow.isrowmenu = isrowmenu; documentHolder.pmiEntireShow.isrowmenu = isrowmenu;