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

Merge pull request #1997 from ONLYOFFICE/fix/bug-59278

Browse source 
Fix Bug 59278
This commit is contained in:
Julia Radzhabova 2022-10-10 23:10:27 +03:00 committed by GitHub
parent 1035069d92 30d8937204
commit 01b47592b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/controller/DocumentHolder.js
View file

@ -2230,7 +2230,7 @@ define([
}, },
onRefreshField: function(item, e){ onRefreshField: function(item, e){
this.api && this.api.asc_UpdateComplexField(item.options.fieldProps); this.api && this.api.asc_UpdateFields(true);
this.editComplete(); this.editComplete();
}, },

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

@ -1420,13 +1420,10 @@ define([
me.menuAddCommentTable.setDisabled(value.paraProps!==undefined && value.paraProps.locked===true); me.menuAddCommentTable.setDisabled(value.paraProps!==undefined && value.paraProps.locked===true);
/** coauthoring end **/ /** coauthoring end **/
var in_field = me.api.asc_GetCurrentComplexField(); var in_field = me.api.asc_HaveFields(true);
me.menuTableRefreshField.setVisible(!!in_field); me.menuTableRefreshField.setVisible(!!in_field);
me.menuTableRefreshField.setDisabled(disabled); me.menuTableRefreshField.setDisabled(disabled);
menuTableFieldSeparator.setVisible(!!in_field); menuTableFieldSeparator.setVisible(!!in_field);
if (in_field) {
me.menuTableRefreshField.options.fieldProps = in_field;
}
}, },
items: [ items: [
me.menuSpellCheckTable, me.menuSpellCheckTable,
@ -1996,13 +1993,10 @@ define([
me.menuAddCommentPara.setDisabled(value.paraProps && value.paraProps.locked === true); me.menuAddCommentPara.setDisabled(value.paraProps && value.paraProps.locked === true);
/** coauthoring end **/ /** coauthoring end **/
var in_field = me.api.asc_GetCurrentComplexField(); var in_field = me.api.asc_HaveFields(true);
me.menuParaRefreshField.setVisible(!!in_field); me.menuParaRefreshField.setVisible(!!in_field);
me.menuParaRefreshField.setDisabled(disabled); me.menuParaRefreshField.setDisabled(disabled);
menuParaFieldSeparator.setVisible(!!in_field); menuParaFieldSeparator.setVisible(!!in_field);
if (in_field) {
me.menuParaRefreshField.options.fieldProps = in_field;
}
var listId = me.api.asc_GetCurrentNumberingId(), var listId = me.api.asc_GetCurrentNumberingId(),
in_list = (listId !== null); in_list = (listId !== null);