diff --git a/apps/documenteditor/mobile/src/controller/LongActions.jsx b/apps/documenteditor/mobile/src/controller/LongActions.jsx index 740351164..94dca84c8 100644 --- a/apps/documenteditor/mobile/src/controller/LongActions.jsx +++ b/apps/documenteditor/mobile/src/controller/LongActions.jsx @@ -7,6 +7,9 @@ const LongActionsController = () => { const {t} = useTranslation(); const _t = t("LongActions", { returnObjects: true }); + const ApplyEditRights = -255; + const LoadingDocument = -256; + const stackLongActions = new IrregularStack({ strongCompare : function(obj1, obj2){return obj1.id === obj2.id && obj1.type === obj2.type;}, weakCompare : function(obj1, obj2){return obj1.type === obj2.type;} @@ -18,7 +21,7 @@ const LongActionsController = () => { if (loadMask && loadMask.el) { f7.dialog.close(loadMask.el); } - } + }; useEffect( () => { Common.Notifications.on('engineCreated', (api) => { diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 44a1aa35b..2483c11db 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -123,7 +123,9 @@ "txtEditingMode": "Set editing mode...", "loadingDocumentTitleText": "Loading document", "loadingDocumentTextText": "Loading document...", - "textLoadingDocument": "Loading document" + "textLoadingDocument": "Loading document", + "loadThemeTitleText": "Loading Theme", + "loadThemeTextText": "Loading theme..." }, "ContextMenu": { "menuViewComment": "View Comment", diff --git a/apps/presentationeditor/mobile/src/controller/LongActions.jsx b/apps/presentationeditor/mobile/src/controller/LongActions.jsx index 4dbb515cf..f5b5e50b7 100644 --- a/apps/presentationeditor/mobile/src/controller/LongActions.jsx +++ b/apps/presentationeditor/mobile/src/controller/LongActions.jsx @@ -7,6 +7,9 @@ const LongActionsController = () => { const {t} = useTranslation(); const _t = t("LongActions", {returnObjects: true}); + const ApplyEditRights = -255; + const LoadingDocument = -256; + const stackLongActions = new IrregularStack({ strongCompare : function(obj1, obj2){return obj1.id === obj2.id && obj1.type === obj2.type;}, weakCompare : function(obj1, obj2){return obj1.type === obj2.type;} @@ -118,6 +121,11 @@ const LongActionsController = () => { text = _t.uploadImageTextText; break; + case Asc.c_oAscAsyncAction['LoadTheme']: + title = _t.loadThemeTitleText; + text = _t.loadThemeTextText; + break; + case Asc.c_oAscAsyncAction['ApplyChanges']: title = _t.applyChangesTitleText; text = _t.applyChangesTextText; @@ -151,7 +159,7 @@ const LongActionsController = () => { } if (action.type === Asc.c_oAscAsyncActionType['BlockInteraction']) { - if (action.id === Asc.c_oAscAsyncAction['ApplyChanges']) { + if (action.id === Asc.c_oAscAsyncAction['ApplyChanges'] || action.id === Asc.c_oAscAsyncAction['LoadDocumentFonts']) { return; } @@ -161,7 +169,6 @@ const LongActionsController = () => { loadMask = f7.dialog.preloader(title); } } - }; const onOpenDocument = (progress) => { diff --git a/apps/spreadsheeteditor/mobile/src/controller/LongActions.jsx b/apps/spreadsheeteditor/mobile/src/controller/LongActions.jsx index 0f2fb50f7..08127984b 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/LongActions.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/LongActions.jsx @@ -7,6 +7,9 @@ const LongActionsController = () => { const {t} = useTranslation(); const _t = t("LongActions", { returnObjects: true }); + const ApplyEditRights = -255; + const LoadingDocument = -256; + const stackLongActions = new IrregularStack({ strongCompare : function(obj1, obj2){return obj1.id === obj2.id && obj1.type === obj2.type;}, weakCompare : function(obj1, obj2){return obj1.type === obj2.type;} @@ -18,7 +21,7 @@ const LongActionsController = () => { if (loadMask && loadMask.el) { f7.dialog.close(loadMask.el); } - } + }; useEffect( () => { Common.Notifications.on('engineCreated', (api) => {