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

Fix Bug 49343

Browse source
This commit is contained in:
ShimaginAndrey 2021-05-27 20:54:43 +03:00
parent a65bb211d7
commit 552362ed55
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/documenteditor/mobile/src/controller/ContextMenu.jsx
View file

@ -25,6 +25,7 @@ class ContextMenu extends ContextMenuController {
this.onApiHideComment = this.onApiHideComment.bind(this); this.onApiHideComment = this.onApiHideComment.bind(this);
this.onApiShowChange = this.onApiShowChange.bind(this); this.onApiShowChange = this.onApiShowChange.bind(this);
this.getUserName = this.getUserName.bind(this); this.getUserName = this.getUserName.bind(this);
this.ShowModal = this.ShowModal.bind(this);
} }
static closeContextMenu() { static closeContextMenu() {
@ -43,8 +44,12 @@ class ContextMenu extends ContextMenuController {
api.asc_unregisterCallback('asc_onShowComment', this.onApiShowComment); api.asc_unregisterCallback('asc_onShowComment', this.onApiShowComment);
api.asc_unregisterCallback('asc_onHideComment', this.onApiHideComment); api.asc_unregisterCallback('asc_onHideComment', this.onApiHideComment);
api.asc_unregisterCallback('asc_onShowRevisionsChange', this.onApiShowChange); api.asc_unregisterCallback('asc_onShowRevisionsChange', this.onApiShowChange);
Common.Notifications.off('showSplitModal', this.ShowModal);
} }
ShowModal() {
this.showSplitModal()
}
onApiShowComment(comments) { onApiShowComment(comments) {
this.isComments = comments && comments.length > 0; this.isComments = comments && comments.length > 0;
@ -199,6 +204,7 @@ class ContextMenu extends ContextMenuController {
api.asc_registerCallback('asc_onShowComment', this.onApiShowComment); api.asc_registerCallback('asc_onShowComment', this.onApiShowComment);
api.asc_registerCallback('asc_onHideComment', this.onApiHideComment); api.asc_registerCallback('asc_onHideComment', this.onApiHideComment);
api.asc_registerCallback('asc_onShowRevisionsChange', this.onApiShowChange); api.asc_registerCallback('asc_onShowRevisionsChange', this.onApiShowChange);
Common.Notifications.on('showSplitModal', this.ShowModal);
} }
initMenuItems() { initMenuItems() {

6
apps/documenteditor/mobile/src/controller/Error.jsx
View file

@ -199,14 +199,18 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu
Common.Gateway.reportWarning(id, config.msg); Common.Gateway.reportWarning(id, config.msg);
config.title = _t.notcriticalErrorTitle; config.title = _t.notcriticalErrorTitle;
config.callback = (btn) => { config.callback = (btn) => {
if (id === Asc.c_oAscError.ID.Warning && btn === 'ok' && (storeAppOptions.canDownload || storeAppOptions.canDownloadOrigin)) { if (id === Asc.c_oAscError.ID.Warning && btn === 'ok' && (storeAppOptions.canDownload || storeAppOptions.canDownloadOrigin)) {
api.asc_DownloadOrigin(); api.asc_DownloadOrigin();
} else if(id === Asc.c_oAscError.ID.SplitCellMaxRows ||
Asc.c_oAscError.ID.SplitCellMaxCols ||
Asc.c_oAscError.ID.SplitCellRowsDivider && btn === 'ok' && (storeAppOptions.canDownload || storeAppOptions.canDownloadOrigin)) {
Common.Notifications.trigger('showSplitModal',true);
} }
storeAppOptions.changeEditingRights(false); storeAppOptions.changeEditingRights(false);
}; };
} }
f7.dialog.create({ f7.dialog.create({
cssClass: 'error-dialog', cssClass: 'error-dialog',
title : config.title, title : config.title,