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

Merge pull request #1457 from ONLYOFFICE/release/v7.0.0

Browse source 
Release/v7.0.0
This commit is contained in:
Julia Radzhabova 2022-01-10 13:14:40 +03:00 committed by GitHub
parent ab17495853 b5d131193a
commit d6c254f5cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/resources/help/en/Contents.json
View file

@ -53,7 +53,7 @@
{ "src": "UsageInstructions/CreateTableOfContents.htm", "name": "Create table of contents" },
{"src": "UsageInstructions/AddTableofFigures.htm", "name": "Add and Format a Table of Figures" },
{ "src": "UsageInstructions/CreateFillableForms.htm", "name": "Create fillable forms", "headername": "Fillable forms" },
{ "src": "UsageInstructions/FillingOutForm.htm", "headername": "Filling Out a Form" },
{ "src": "UsageInstructions/FillingOutForm.htm", "name": "Filling Out a Form" },
{"src": "UsageInstructions/UseMailMerge.htm", "name": "Use mail merge", "headername": "Mail Merge"},
{ "src": "UsageInstructions/InsertEquation.htm", "name": "Insert equations", "headername": "Math equations" },
{"src": "HelpfulHints/CollaborativeEditing.htm", "name": "Collaborative document editing", "headername": "Document co-editing"},

2
apps/documenteditor/mobile/src/controller/Main.jsx
View file

@ -697,7 +697,7 @@ class MainController extends Component {
const { t } = this.props;
if (found) {
f7.dialog.alert(null, !(found - replaced > 0) ? Common.Utils.String.format(t('Main.textReplaceSuccess'), replaced) : Common.Utils.String.format(t('Main.textReplaceSkipped'), found - replaced));
f7.dialog.alert(null, !(found - replaced > 0) ? t('Main.textReplaceSuccess').replace(/\{0\}/, `${replaced}`) : t('Main.textReplaceSkipped').replace(/\{0\}/, `${found - replaced}`));
} else {
f7.dialog.alert(null, t('Main.textNoTextFound'));
}

9
apps/documenteditor/mobile/src/view/edit/EditShape.jsx
View file

@ -516,15 +516,18 @@ const EditShape = props => {
|| shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5'
|| shapeType=='straightConnector1';
let controlProps = api && api.asc_IsContentControl() ? api.asc_GetContentControlProperties() : null,
fixedSize = false;
const inControl = api.asc_IsContentControl();
const controlProps = (api && inControl) ? api.asc_GetContentControlProperties() : null;
const lockType = controlProps ? controlProps.get_Lock() : Asc.c_oAscSdtLockType.Unlocked;
let fixedSize = false;
if (controlProps) {
let spectype = controlProps.get_SpecificType();
fixedSize = (spectype == Asc.c_oAscContentControlSpecificType.CheckBox || spectype == Asc. c_oAscContentControlSpecificType.ComboBox || spectype == Asc.c_oAscContentControlSpecificType.DropDownList || spectype == Asc.c_oAscContentControlSpecificType.None || spectype == Asc.c_oAscContentControlSpecificType.Picture) && controlProps.get_FormPr() && controlProps.get_FormPr().get_Fixed();
}
let disableRemove = !!props.storeFocusObjects.paragraphObject;
let disableRemove = !!props.storeFocusObjects.paragraphObject || (lockType == Asc.c_oAscSdtLockType.SdtContentLocked || lockType == Asc.c_oAscSdtLockType.SdtLocked);
return (
<Fragment>

2
apps/presentationeditor/mobile/src/controller/Main.jsx
View file

@ -427,7 +427,7 @@ class MainController extends Component {
const { t } = this.props;
if (found) {
f7.dialog.alert(null, !(found - replaced > 0) ? Common.Utils.String.format(t('Controller.Main.textReplaceSuccess'), replaced) : Common.Utils.String.format(t('Controller.Main.textReplaceSkipped'), found - replaced));
f7.dialog.alert(null, !(found - replaced > 0) ? t('Controller.Main.textReplaceSuccess').replace(/\{0\}/, `${replaced}`) : t('Controller.Main.textReplaceSkipped').replace(/\{0\}/, `${found - replaced}`));
} else {
f7.dialog.alert(null, t('Controller.Main.textNoTextFound'));
}

9
apps/spreadsheeteditor/mobile/src/controller/Main.jsx
View file

@ -402,11 +402,18 @@ class MainController extends Component {
this.api.asc_registerCallback('asc_onEditCell', (state) => {
if (state == Asc.c_oAscCellEditorState.editStart || state == Asc.c_oAscCellEditorState.editEnd) {
const isEditCell = state === Asc.c_oAscCellEditorState.editStart;
const isEditEnd = state === Asc.c_oAscCellEditorState.editEnd;
if (storeFocusObjects.isEditCell !== isEditCell) {
storeFocusObjects.setEditCell(isEditCell);
}
if(isEditEnd) {
storeFocusObjects.setEditFormulaMode(false);
}
} else {
const isFormula = state === Asc.c_oAscCellEditorState.editFormula;
if (storeFocusObjects.editFormulaMode !== isFormula) {
storeFocusObjects.setEditFormulaMode(isFormula);
}
@ -461,7 +468,7 @@ class MainController extends Component {
const { t } = this.props;
if (this.api.isReplaceAll) {
f7.dialog.alert(null, (found) ? ((!found - replaced) ? Common.Utils.String.format(t('Controller.Main.textReplaceSuccess'), replaced) : Common.Utils.String.format(t('Controller.Main.textReplaceSkipped'), found - replaced)) : t('Controller.Main.textNoTextFound'));
f7.dialog.alert(null, (found) ? ((!found - replaced) ? t('Controller.Main.textReplaceSuccess').replace(/\{0\}/, `${replaced}`) : t('Controller.Main.textReplaceSkipped').replace(/\{0\}/, `${found - replaced}`)) : t('Controller.Main.textNoTextFound'));
}
}