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

[DE] Support review changes for selection

Browse source
This commit is contained in:
Julia Radzhabova 2022-01-21 00:39:02 +03:00
parent 0d1549e56f
commit 547125cb82
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/resources/less/dropdown-submenu.less
View file

@ -26,7 +26,7 @@
border-left-color: @icon-normal-ie; border-left-color: @icon-normal-ie;
border-left-color: @icon-normal; border-left-color: @icon-normal;
margin-top: 5px; margin-top: 5px;
margin-right: -10px; margin-right: -7px;
} }
&.over:not(.disabled) > .dropdown-menu { &.over:not(.disabled) > .dropdown-menu {

19
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -3237,6 +3237,7 @@ define([
this.tableMenu = new Common.UI.Menu({ this.tableMenu = new Common.UI.Menu({
cls: 'shifted-right', cls: 'shifted-right',
// maxHeight: 610,
initMenu: function(value){ initMenu: function(value){
// table properties // table properties
if (_.isUndefined(value.tableProps)) if (_.isUndefined(value.tableProps))
@ -3244,7 +3245,7 @@ define([
var isEquation= (value.mathProps && value.mathProps.value); var isEquation= (value.mathProps && value.mathProps.value);
for (var i = 8; i < 27; i++) { for (var i = 11; i < 30; i++) {
me.tableMenu.items[i].setVisible(!isEquation); me.tableMenu.items[i].setVisible(!isEquation);
} }
@ -3285,8 +3286,8 @@ define([
me.menuTableDirect270.setChecked(dir == Asc.c_oAscCellTextDirection.BTLR); me.menuTableDirect270.setChecked(dir == Asc.c_oAscCellTextDirection.BTLR);
var disabled = value.tableProps.locked || (value.headerProps!==undefined && value.headerProps.locked); var disabled = value.tableProps.locked || (value.headerProps!==undefined && value.headerProps.locked);
me.tableMenu.items[11].setDisabled(disabled); me.tableMenu.items[14].setDisabled(disabled);
me.tableMenu.items[12].setDisabled(disabled); me.tableMenu.items[15].setDisabled(disabled);
if (me.api) { if (me.api) {
mnuTableMerge.setDisabled(disabled || !me.api.CheckBeforeMergeCells()); mnuTableMerge.setDisabled(disabled || !me.api.CheckBeforeMergeCells());
@ -3306,6 +3307,11 @@ define([
menuTablePrint.setVisible(me.mode.canPrint); menuTablePrint.setVisible(me.mode.canPrint);
menuTablePrint.setDisabled(!cancopy); menuTablePrint.setDisabled(!cancopy);
var lockreview = Common.Utils.InternalSettings.get("de-accept-reject-lock");
menuTableAccept.setVisible(!lockreview);
menuTableReject.setVisible(!lockreview);
menuTableReviewSeparator.setVisible(!lockreview);
// bullets & numbering // bullets & numbering
var listId = me.api.asc_GetCurrentNumberingId(), var listId = me.api.asc_GetCurrentNumberingId(),
in_list = (listId !== null); in_list = (listId !== null);
@ -3383,9 +3389,9 @@ define([
//equation menu //equation menu
var eqlen = 0; var eqlen = 0;
if (isEquation) { if (isEquation) {
eqlen = me.addEquationMenu(false, 7); eqlen = me.addEquationMenu(false, 10);
} else } else
me.clearEquationMenu(false, 7); me.clearEquationMenu(false, 10);
menuEquationSeparatorInTable.setVisible(isEquation && eqlen>0); menuEquationSeparatorInTable.setVisible(isEquation && eqlen>0);
var control_lock = (value.paraProps) ? (!value.paraProps.value.can_DeleteBlockContentControl() || !value.paraProps.value.can_EditBlockContentControl() || var control_lock = (value.paraProps) ? (!value.paraProps.value.can_DeleteBlockContentControl() || !value.paraProps.value.can_EditBlockContentControl() ||
@ -3429,6 +3435,9 @@ define([
menuTablePaste, menuTablePaste,
menuTablePrint, menuTablePrint,
{ caption: '--' }, { caption: '--' },
menuTableAccept,
menuTableReject,
menuTableReviewSeparator,
menuEquationSeparatorInTable, menuEquationSeparatorInTable,
menuTableRefreshField, menuTableRefreshField,
menuTableFieldSeparator, menuTableFieldSeparator,