From 90b613d88d30c06db247f5c2444f93c51a05e3e1 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Thu, 18 Mar 2021 17:00:52 +0300 Subject: [PATCH 01/23] [mobile] Corrected some elements --- .../mobile/src/controller/Main.jsx | 5 ++++ .../mobile/src/store/focusObjects.js | 6 ++-- .../mobile/src/view/edit/EditImage.jsx | 4 +-- .../mobile/src/view/edit/EditTable.jsx | 4 +-- .../mobile/src/view/edit/EditText.jsx | 1 + .../mobile/src/view/settings/Settings.jsx | 29 +++++++++++++++++-- .../mobile/src/controller/Main.jsx | 2 ++ .../mobile/src/view/edit/EditTable.jsx | 12 ++++---- .../mobile/src/view/settings/Settings.jsx | 3 +- .../mobile/src/view/settings/Settings.jsx | 3 +- .../framework7-react/build/webpack.config.js | 1 + 11 files changed, 54 insertions(+), 16 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx index 564edf439..05824fd1d 100644 --- a/apps/documenteditor/mobile/src/controller/Main.jsx +++ b/apps/documenteditor/mobile/src/controller/Main.jsx @@ -251,10 +251,15 @@ class MainController extends Component { switch (type) { case 0: storeTextSettings.resetBullets(subtype); + storeTextSettings.resetNumbers(-1); break; case 1: storeTextSettings.resetNumbers(subtype); + storeTextSettings.resetBullets(-1); break; + default: + storeTextSettings.resetBullets(-1); + storeTextSettings.resetNumbers(-1); } }); this.api.asc_registerCallback('asc_onPrAlign', (align) => { diff --git a/apps/documenteditor/mobile/src/store/focusObjects.js b/apps/documenteditor/mobile/src/store/focusObjects.js index b9a9f4e16..cb27b16d0 100644 --- a/apps/documenteditor/mobile/src/store/focusObjects.js +++ b/apps/documenteditor/mobile/src/store/focusObjects.js @@ -155,8 +155,10 @@ export class storeFocusObjects { get chartObject() { const charts = []; for (let object of this._focusObjects) { - if (object.get_ObjectValue() && object.get_ObjectValue().get_ChartProperties()) { - charts.push(object); + if (object.get_ObjectType() == Asc.c_oAscTypeSelectElement.Image) { + if (object.get_ObjectValue() && object.get_ObjectValue().get_ChartProperties()) { + charts.push(object); + } } } if (charts.length > 0) { diff --git a/apps/documenteditor/mobile/src/view/edit/EditImage.jsx b/apps/documenteditor/mobile/src/view/edit/EditImage.jsx index bcc3f97ce..106408d41 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditImage.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditImage.jsx @@ -76,10 +76,10 @@ const PageWrap = props => { } - {props.onMoveText(!moveText)}}/> + {props.onMoveText(!moveText)}}/> - {props.onOverlap(!overlap)}}/> + {props.onOverlap(!overlap)}}/> { diff --git a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx index 01efdba28..3dfc883ab 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx @@ -70,10 +70,10 @@ const PageWrap = props => { - {props.onWrapType(c_tableWrap.TABLE_WRAP_NONE)}}> + {props.onWrapType(c_tableWrap.TABLE_WRAP_NONE)}}> {!isAndroid && } - {props.onWrapType(c_tableWrap.TABLE_WRAP_PARALLEL)}}> + {props.onWrapType(c_tableWrap.TABLE_WRAP_PARALLEL)}}> {!isAndroid && } diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx index 93b114610..c1df19309 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx @@ -131,6 +131,7 @@ const PageBullets = props => { ]; const storeTextSettings = props.storeTextSettings; const typeBullets = storeTextSettings.typeBullets; + return( diff --git a/apps/documenteditor/mobile/src/view/settings/Settings.jsx b/apps/documenteditor/mobile/src/view/settings/Settings.jsx index a199d82e3..63e744df1 100644 --- a/apps/documenteditor/mobile/src/view/settings/Settings.jsx +++ b/apps/documenteditor/mobile/src/view/settings/Settings.jsx @@ -72,6 +72,31 @@ const SettingsList = inject("storeAppOptions")( observer( withTranslation()( pro } }; + const onPrint = () => { + closeModal(); + const api = Common.EditorApi.get(); + api.asc_Print(); + }; + + const showHelp = () => { + let url = __HELP_URL__; + // let url = 'https://helpcenter.onlyoffice.com'; + + if (url.charAt(url.length-1) !== '/') { + url += '/'; + } + + if (Device.sailfish || Device.android) { + url+='mobile-applications/documents/mobile-web-editors/android/index.aspx'; + } + else { + url+='mobile-applications/documents/mobile-web-editors/ios/index.aspx'; + } + + closeModal(); + window.open(url, "_blank"); + }; + useEffect(() => { }); @@ -138,7 +163,7 @@ const SettingsList = inject("storeAppOptions")( observer( withTranslation()( pro } {_canPrint && - + } @@ -146,7 +171,7 @@ const SettingsList = inject("storeAppOptions")( observer( withTranslation()( pro {_canHelp && - + } diff --git a/apps/presentationeditor/mobile/src/controller/Main.jsx b/apps/presentationeditor/mobile/src/controller/Main.jsx index d8ee673da..8d67cd2bf 100644 --- a/apps/presentationeditor/mobile/src/controller/Main.jsx +++ b/apps/presentationeditor/mobile/src/controller/Main.jsx @@ -265,9 +265,11 @@ class MainController extends Component { switch (type) { case 0: storeTextSettings.resetBullets(subtype); + storeTextSettings.resetNumbers(-1); break; case 1: storeTextSettings.resetNumbers(subtype); + storeTextSettings.resetBullets(-1); break; default: storeTextSettings.resetBullets(-1); diff --git a/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx b/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx index 8786cc95e..0529639f4 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx @@ -60,24 +60,24 @@ const PageStyleOptions = props => { - {props.onCheckTemplateChange(tableLook, 0, !isFirstRow)}}/> + {props.onCheckTemplateChange(tableLook, 0, !isFirstRow)}}/> - {props.onCheckTemplateChange(tableLook, 1, !isLastRow)}}/> + {props.onCheckTemplateChange(tableLook, 1, !isLastRow)}}/> - {props.onCheckTemplateChange(tableLook, 2, !isBandHor)}}/> + {props.onCheckTemplateChange(tableLook, 2, !isBandHor)}}/> - {props.onCheckTemplateChange(tableLook, 3, !isFirstCol)}}/> + {props.onCheckTemplateChange(tableLook, 3, !isFirstCol)}}/> - {props.onCheckTemplateChange(tableLook, 4, !isLastCol)}}/> + {props.onCheckTemplateChange(tableLook, 4, !isLastCol)}}/> - {props.onCheckTemplateChange(tableLook, 5, !isBandVer)}}/> + {props.onCheckTemplateChange(tableLook, 5, !isBandVer)}}/> diff --git a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx index 43deb4bdf..7f36baaf5 100644 --- a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx +++ b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx @@ -83,7 +83,8 @@ const SettingsList = withTranslation()(props => { const showHelp = () => { // let url = '{{HELP_URL}}'; - let url = 'https://helpcenter.onlyoffice.com'; + let url = __HELP_URL__; + // let url = 'https://helpcenter.onlyoffice.com'; if (url.charAt(url.length-1) !== '/') { url += '/'; diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx index 938900eff..485eb9bf8 100644 --- a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx @@ -91,7 +91,8 @@ const SettingsList = withTranslation()(props => { const showHelp = () => { // let url = '{{HELP_URL}}'; - let url = 'https://helpcenter.onlyoffice.com'; + // let url = 'https://helpcenter.onlyoffice.com'; + let url = __HELP_URL__; if (url.charAt(url.length-1) !== '/') { url += '/'; diff --git a/vendor/framework7-react/build/webpack.config.js b/vendor/framework7-react/build/webpack.config.js index 8d4fc4a43..42acab398 100644 --- a/vendor/framework7-react/build/webpack.config.js +++ b/vendor/framework7-react/build/webpack.config.js @@ -159,6 +159,7 @@ module.exports = { __PUBLISHER_PHONE__: JSON.stringify('+371 633-99867'), __PUBLISHER_URL__: JSON.stringify('https://www.onlyoffice.com'), __PUBLISHER_NAME__: JSON.stringify('Ascensio System SIA'), + __HELP_URL__: JSON.stringify('https://helpcenter.onlyoffice.com'), }), ...(env === 'production' ? [ From dd3b5fafe0d651b7e91b790f189dbeb531f6d3f7 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Tue, 30 Mar 2021 17:51:53 +0300 Subject: [PATCH 02/23] [SSE mobile] Corrected some things --- apps/common/mobile/lib/view/Search.jsx | 4 ++-- apps/documenteditor/mobile/src/controller/edit/EditText.jsx | 2 +- .../mobile/src/controller/edit/EditText.jsx | 2 +- .../spreadsheeteditor/mobile/src/controller/edit/EditCell.jsx | 2 +- .../spreadsheeteditor/mobile/src/controller/edit/EditText.jsx | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/common/mobile/lib/view/Search.jsx b/apps/common/mobile/lib/view/Search.jsx index 17e4cfb4d..ae026d894 100644 --- a/apps/common/mobile/lib/view/Search.jsx +++ b/apps/common/mobile/lib/view/Search.jsx @@ -272,13 +272,13 @@ class SearchView extends Component {
- {this.changeSearchQuery(e.target.value)}} /> {isIos ? : null}
- {this.changeReplaceQuery(e.target.value)}} /> {isIos ? : null} diff --git a/apps/documenteditor/mobile/src/controller/edit/EditText.jsx b/apps/documenteditor/mobile/src/controller/edit/EditText.jsx index 271741f52..922458b4b 100644 --- a/apps/documenteditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/controller/edit/EditText.jsx @@ -18,7 +18,7 @@ class EditTextController extends Component { if (isDecrement) { typeof size === 'undefined' ? api.FontSizeOut() : size = Math.max(1, --size); } else { - typeof size === 'undefined' ? api.FontSizeIn : size = Math.min(100, ++size); + typeof size === 'undefined' ? api.FontSizeIn : size = Math.min(300, ++size); } if (typeof size !== 'undefined') { api.put_TextPrFontSize(size); diff --git a/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx b/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx index 2b9ce3ae1..01ddd0801 100644 --- a/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx @@ -132,7 +132,7 @@ class EditTextController extends Component { if (isDecrement) { typeof size === 'undefined' ? api.FontSizeOut() : size = Math.max(1, --size); } else { - typeof size === 'undefined' ? api.FontSizeIn : size = Math.min(100, ++size); + typeof size === 'undefined' ? api.FontSizeIn : size = Math.min(300, ++size); } if (typeof size !== 'undefined') { api.put_TextPrFontSize(size); diff --git a/apps/spreadsheeteditor/mobile/src/controller/edit/EditCell.jsx b/apps/spreadsheeteditor/mobile/src/controller/edit/EditCell.jsx index 22c23b7ae..b0d7bd9b7 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/edit/EditCell.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/edit/EditCell.jsx @@ -47,7 +47,7 @@ class EditCellController extends Component { if (isDecrement) { typeof size === 'undefined' ? api.asc_decreaseFontSize() : size = Math.max(1, --size); } else { - typeof size === 'undefined' ? api.asc_increaseFontSize() : size = Math.min(100, ++size); + typeof size === 'undefined' ? api.asc_increaseFontSize() : size = Math.min(409, ++size); } if (typeof size !== 'undefined') { diff --git a/apps/spreadsheeteditor/mobile/src/controller/edit/EditText.jsx b/apps/spreadsheeteditor/mobile/src/controller/edit/EditText.jsx index 5be6e60dd..3aac994dd 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/edit/EditText.jsx @@ -69,7 +69,7 @@ class EditTextController extends Component { if (isDecrement) { typeof size === 'undefined' ? api.asc_decreaseFontSize() : size = Math.max(1, --size); } else { - typeof size === 'undefined' ? api.asc_increaseFontSize() : size = Math.min(100, ++size); + typeof size === 'undefined' ? api.asc_increaseFontSize() : size = Math.min(409, ++size); } if (typeof size !== 'undefined') { From 0bbd65fadd1917c1ab352ec3038514b48d3de05a Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Thu, 1 Apr 2021 01:23:00 +0300 Subject: [PATCH 03/23] [PE mobile] Bug 47909, Bug 48110 --- apps/common/mobile/resources/less/common.less | 1 + apps/presentationeditor/mobile/locale/en.json | 3 ++- apps/presentationeditor/mobile/src/view/add/Add.jsx | 12 +++++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index ad82957bc..428a99e1b 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -192,6 +192,7 @@ height: 38px; margin-top: 14px; background-image: url(../img/themes/themes.png); + display: block; } .item-theme.active:before { content: ''; diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index b90038922..444a910fc 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -273,7 +273,8 @@ "textSearch": "Search", "textCaseSensitive": "Case Sensitive", "textHighlight": "Highlight Results", - "textNoTextFound": "Text not Found" + "textNoTextFound": "Text not Found", + "textSelectObjectToEdit": "Select object to edit" } }, "Common": { diff --git a/apps/presentationeditor/mobile/src/view/add/Add.jsx b/apps/presentationeditor/mobile/src/view/add/Add.jsx index d9483113f..9608afc93 100644 --- a/apps/presentationeditor/mobile/src/view/add/Add.jsx +++ b/apps/presentationeditor/mobile/src/view/add/Add.jsx @@ -73,9 +73,11 @@ const AddLayoutContent = ({ tabs }) => { const AddTabs = props => { const { t } = useTranslation(); const _t = t('View.Add', {returnObjects: true}); + const api = Common.EditorApi.get(); + const countPages = api.getCountPages(); const showPanels = props.showPanels; const tabs = []; - if (!showPanels) { + if (!showPanels && countPages) { tabs.push({ caption: _t.textSlide, id: 'add-slide', @@ -101,6 +103,14 @@ const AddTabs = props => { component: }); } + if(!showPanels && !countPages) { + tabs.push({ + caption: _t.textSlide, + id: 'add-slide', + icon: 'icon-add-slide', + component: + }); + } if (showPanels && showPanels === 'link') { tabs.push({ caption: _t.textAddLink, From 5d68405408b3978b2ccfdeadf0da23498b440451 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 2 Apr 2021 16:16:23 +0300 Subject: [PATCH 04/23] [DE SSE mobile] Bug 48776 --- apps/common/mobile/resources/less/common.less | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 428a99e1b..1160e4d26 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -84,6 +84,12 @@ } } +.dialog { + .content-block { + padding: 0; + } +} + .about { .content-block { margin: 0 auto 15px; @@ -696,6 +702,24 @@ input[type="number"]::-webkit-inner-spin-button { } +.picker-3d { + .picker-item { + padding: 0; + text-align: left; + font-size: 16px; + span { + padding: 0; + } + } +} + +.picker-center-highlight { + width: 100%; + left: 0; + right: 0; +} + + From 0277ac930611db0637100a2c5e6891ea495610a8 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 15 Apr 2021 12:42:44 +0300 Subject: [PATCH 05/23] [PE mobile] Add toolbar, add logo --- .../resources/less/common-material.less | 20 +- apps/common/mobile/resources/less/common.less | 6 + .../mobile/src/controller/Toolbar.jsx | 2 + .../mobile/src/less/app-material.less | 8 - .../mobile/src/controller/Main.jsx | 24 +- .../mobile/src/controller/Toolbar.jsx | 209 ++++++++++++++++++ .../mobile/src/page/main.jsx | 40 ++-- .../mobile/src/view/Toolbar.jsx | 35 +++ 8 files changed, 303 insertions(+), 41 deletions(-) create mode 100644 apps/presentationeditor/mobile/src/controller/Toolbar.jsx create mode 100644 apps/presentationeditor/mobile/src/view/Toolbar.jsx diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index a1a938939..4bec965e1 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -7,6 +7,17 @@ @darkGrey: #757575; --f7-navbar-shadow-image: none; + + --f7-navbar-bg-color: @themeColor; + --f7-navbar-link-color: @navBarIconColor; + --f7-navbar-text-color: @navBarIconColor; + --f7-navbar-height: 56px; + + --f7-subnavbar-bg-color: @themeColor; + --f7-subnavbar-link-color: @navBarIconColor; + --f7-subnavbar-text-color: @navBarIconColor; + --f7-subnavbar-height: 56px; + --f7-radio-active-color: @themeColor; --f7-toggle-active-color: @themeColor; --f7-range-bar-active-bg-color: @themeColor; @@ -29,6 +40,13 @@ justify-content: center; } } + + .page.page-with-subnavbar.page-with-logo { + .page-content { + --f7-page-navbar-offset: var(--f7-navbar-height); + } + } + // Buttons .segmented { .decrement, .increment { @@ -412,7 +430,7 @@ } a.icon-only { width: auto; - height: 48px; + height: 56px; } .buttons-row-replace a { color: @white; diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index cb7c5f682..77b45d5c3 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -25,6 +25,12 @@ } } +.subnavbar { + .subnavbar-inner { + padding: 0; + } +} + .page.page-with-subnavbar { .page-content { --f7-page-subnavbar-offset: 0px; diff --git a/apps/documenteditor/mobile/src/controller/Toolbar.jsx b/apps/documenteditor/mobile/src/controller/Toolbar.jsx index 9ff6ce8e8..30d47b86b 100644 --- a/apps/documenteditor/mobile/src/controller/Toolbar.jsx +++ b/apps/documenteditor/mobile/src/controller/Toolbar.jsx @@ -25,6 +25,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview')(prop Common.Notifications.on('api:disconnect', onCoAuthoringDisconnect); Common.Notifications.on('toolbar:activatecontrols', activateControls); Common.Notifications.on('toolbar:deactivateeditcontrols', deactivateEditControls); + Common.Notifications.on('goback', goBack); }; if ( !Common.EditorApi ) { Common.Notifications.on('document:ready', onDocumentReady); @@ -40,6 +41,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview')(prop Common.Notifications.off('api:disconnect', onCoAuthoringDisconnect); Common.Notifications.off('toolbar:activatecontrols', activateControls); Common.Notifications.off('toolbar:deactivateeditcontrols', deactivateEditControls); + Common.Notifications.off('goback', goBack); const api = Common.EditorApi.get(); api.asc_unregisterCallback('asc_onCanUndo', onApiCanUndo); diff --git a/apps/documenteditor/mobile/src/less/app-material.less b/apps/documenteditor/mobile/src/less/app-material.less index 4515f7854..981437364 100644 --- a/apps/documenteditor/mobile/src/less/app-material.less +++ b/apps/documenteditor/mobile/src/less/app-material.less @@ -5,14 +5,6 @@ .device-android { - --f7-navbar-bg-color: @themeColor; - --f7-navbar-link-color: @navBarIconColor; - --f7-navbar-text-color: @navBarIconColor; - - --f7-subnavbar-bg-color: @themeColor; - --f7-subnavbar-link-color: @navBarIconColor; - --f7-subnavbar-text-color: @navBarIconColor; - // Main Toolbar #editor-navbar.navbar .right { padding-right: 4px; diff --git a/apps/presentationeditor/mobile/src/controller/Main.jsx b/apps/presentationeditor/mobile/src/controller/Main.jsx index 1c7a9bd9b..aa3736bb3 100644 --- a/apps/presentationeditor/mobile/src/controller/Main.jsx +++ b/apps/presentationeditor/mobile/src/controller/Main.jsx @@ -105,13 +105,9 @@ class MainController extends Component { // Common.SharedSettings.set('document', data.doc); - // if (data.doc) { - // DE.getController('Toolbar').setDocumentTitle(data.doc.title); - // if (data.doc.info) { - // data.doc.info.author && console.log("Obsolete: The 'author' parameter of the document 'info' section is deprecated. Please use 'owner' instead."); - // data.doc.info.created && console.log("Obsolete: The 'created' parameter of the document 'info' section is deprecated. Please use 'uploaded' instead."); - // } - // } + if (data.doc) { + Common.Notifications.trigger('setdoctitle', data.doc.title); + } }; const onEditorPermissions = params => { @@ -335,13 +331,14 @@ class MainController extends Component { } _onDocumentContentReady() { - const me = this; - me.api.SetDrawingFreeze(false); + this.api.SetDrawingFreeze(false); - me.api.Resize(); - me.api.zoomFitToPage(); + this.api.Resize(); + this.api.zoomFitToPage(); // me.api.asc_GetDefaultTableStyles && _.defer(function () {me.api.asc_GetDefaultTableStyles()}); + this.applyLicense(); + Common.Gateway.documentReady(); f7.emit('resize'); @@ -357,6 +354,11 @@ class MainController extends Component { // } } + applyLicense() { + /* TO DO */ + Common.Notifications.trigger('toolbar:activatecontrols'); + } + render() { return ( diff --git a/apps/presentationeditor/mobile/src/controller/Toolbar.jsx b/apps/presentationeditor/mobile/src/controller/Toolbar.jsx new file mode 100644 index 000000000..d92f94f4a --- /dev/null +++ b/apps/presentationeditor/mobile/src/controller/Toolbar.jsx @@ -0,0 +1,209 @@ +import React, { useEffect, useState } from 'react'; +import { inject } from 'mobx-react'; +import { f7 } from 'framework7-react'; +import { useTranslation } from 'react-i18next'; +import ToolbarView from "../view/Toolbar"; + +const ToolbarController = inject('storeAppOptions', 'users')(props => { + const {t} = useTranslation(); + const _t = t("Toolbar", { returnObjects: true }); + + const appOptions = props.storeAppOptions; + const isDisconnected = props.users.isDisconnected; + const displayCollaboration = props.users.hasEditUsers || appOptions.canViewComments; + + useEffect(() => { + const onDocumentReady = () => { + const api = Common.EditorApi.get(); + api.asc_registerCallback('asc_onCanUndo', onApiCanUndo); + api.asc_registerCallback('asc_onCanRedo', onApiCanRedo); + api.asc_registerCallback('asc_onFocusObject', onApiFocusObject); + api.asc_registerCallback('asc_onCoAuthoringDisconnect', onCoAuthoringDisconnect); + api.asc_registerCallback('asc_onCountPages', onApiCountPages); + Common.Notifications.on('api:disconnect', onCoAuthoringDisconnect); + Common.Notifications.on('toolbar:activatecontrols', activateControls); + Common.Notifications.on('toolbar:deactivateeditcontrols', deactivateEditControls); + Common.Notifications.on('goback', goBack); + }; + if ( !Common.EditorApi ) { + Common.Notifications.on('document:ready', onDocumentReady); + Common.Notifications.on('setdoctitle', setDocTitle); + Common.Gateway.on('init', loadConfig); + } else { + onDocumentReady(); + } + + return () => { + Common.Notifications.off('document:ready', onDocumentReady); + Common.Notifications.off('setdoctitle', setDocTitle); + Common.Notifications.off('api:disconnect', onCoAuthoringDisconnect); + Common.Notifications.off('toolbar:activatecontrols', activateControls); + Common.Notifications.off('toolbar:deactivateeditcontrols', deactivateEditControls); + Common.Notifications.off('goback', goBack); + + const api = Common.EditorApi.get(); + api.asc_unregisterCallback('asc_onCanUndo', onApiCanUndo); + api.asc_unregisterCallback('asc_onCanRedo', onApiCanRedo); + api.asc_unregisterCallback('asc_onFocusObject', onApiFocusObject); + api.asc_unregisterCallback('asc_onCoAuthoringDisconnect', onCoAuthoringDisconnect); + api.asc_unregisterCallback('asc_onCountPages', onApiCountPages); + } + }); + + const [docTitle, resetDocTitle] = useState(''); + const setDocTitle = (title) => { + resetDocTitle(title); + } + + // Back button + const [isShowBack, setShowBack] = useState(false); + const loadConfig = (data) => { + if (data && data.config && data.config.canBackToFolder !== false && + data.config.customization && data.config.customization.goback && + (data.config.customization.goback.url || data.config.customization.goback.requestClose && data.config.canRequestClose)) { + setShowBack(true); + } + }; + const onBack = () => { + const api = Common.EditorApi.get(); + if (api.isDocumentModified()) { + f7.dialog.create({ + title : _t.dlgLeaveTitleText, + text : _t.dlgLeaveMsgText, + verticalButtons: true, + buttons : [ + { + text: _t.leaveButtonText, + onClick: function() { + goBack(); + } + }, + { + text: _t.stayButtonText, + bold: true + } + ] + }).open(); + } else { + goBack(); + } + }; + const goBack = (current) => { + //if ( !Common.Controllers.Desktop.process('goback') ) { + if (appOptions.customization.goback.requestClose && appOptions.canRequestClose) { + Common.Gateway.requestClose(); + } else { + const href = appOptions.customization.goback.url; + if (!current && appOptions.customization.goback.blank !== false) { + window.open(href, "_blank"); + } else { + parent.location.href = href; + } + } + //} + } + + // Undo and Redo + const [isCanUndo, setCanUndo] = useState(true); + const [isCanRedo, setCanRedo] = useState(true); + const onApiCanUndo = (can) => { + if (isDisconnected) return; + setCanUndo(can); + }; + const onApiCanRedo = (can) => { + if (isDisconnected) return; + setCanRedo(can); + }; + const onUndo = () => { + const api = Common.EditorApi.get(); + if (api) { + api.Undo(); + } + }; + const onRedo = () => { + const api = Common.EditorApi.get(); + if (api) { + api.Redo(); + } + } + + const [disabledAdd, setDisabledAdd] = useState(false); + const [disabledEdit, setDisabledEdit] = useState(false); + const onApiFocusObject = (objects) => { + if (isDisconnected) return; + + if (objects.length > 0) { + let slide_deleted = false, + slide_lock = false, + no_object = true, + objectLocked = false; + objects.forEach((object) => { + const type = object.get_ObjectType(); + const objectValue = object.get_ObjectValue(); + if (type === Asc.c_oAscTypeSelectElement.Slide) { + slide_deleted = objectValue.get_LockDelete(); + slide_lock = objectValue.get_LockLayout() || objectValue.get_LockBackground() || objectValue.get_LockTransition() || objectValue.get_LockTiming(); + } else if (objectValue && typeof objectValue.get_Locked === 'function') { + no_object = false; + objectLocked = objectLocked || objectValue.get_Locked(); + } + }); + + setDisabledAdd(slide_deleted); + setDisabledEdit(slide_deleted || (objectLocked || no_object) && slide_lock); + } + }; + + const [disabledPreview, setDisabledPreview] = useState(false); + const onApiCountPages = (count) => { + setDisabledPreview(count <= 0); + }; + + const [disabledEditControls, setDisabledEditControls] = useState(false); + const [disabledSettings, setDisabledSettings] = useState(false); + const deactivateEditControls = (enableDownload) => { + setDisabledEditControls(true); + if (enableDownload) { + //DE.getController('Settings').setMode({isDisconnected: true, enableDownload: enableDownload}); + } else { + setDisabledSettings(true); + } + }; + + + const [disabledControls, setDisabledControls] = useState(true); + const activateControls = () => { + setDisabledControls(false); + }; + + const onCoAuthoringDisconnect = (enableDownload) => { + deactivateEditControls(enableDownload); + setCanUndo(false); + setCanRedo(false); + f7.popover.close(); + f7.sheet.close(); + f7.popup.close(); + }; + + return ( + + ) +}); + +export {ToolbarController as Toolbar}; \ No newline at end of file diff --git a/apps/presentationeditor/mobile/src/page/main.jsx b/apps/presentationeditor/mobile/src/page/main.jsx index 3a3d2f4cf..9f80b19cb 100644 --- a/apps/presentationeditor/mobile/src/page/main.jsx +++ b/apps/presentationeditor/mobile/src/page/main.jsx @@ -1,15 +1,16 @@ import React, { Component } from 'react'; -import { Page, View, Navbar, NavLeft, NavRight, Link, Icon } from 'framework7-react'; +import { Page, View, Navbar, Subnavbar, Icon } from 'framework7-react'; +import { observer, inject } from "mobx-react"; import EditOptions from '../view/edit/Edit'; import AddOptions from '../view/add/Add'; import Settings from '../view/settings/Settings'; import CollaborationView from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx'; -import { Device } from '../../../../common/mobile/utils/device'; import { Search, SearchSettings } from '../controller/Search'; import ContextMenu from '../controller/ContextMenu'; +import { Toolbar } from "../controller/Toolbar"; -export default class MainPage extends Component { +class MainPage extends Component { constructor(props) { super(props); this.state = { @@ -54,23 +55,18 @@ export default class MainPage extends Component { }; render() { - return ( - + const appOptions = this.props.storeAppOptions; + const config = appOptions.config; + const showLogo = !(appOptions.canBrandingExt && (config.customization && (config.customization.loaderName || config.customization.loaderLogo))); + return ( + {/* Top Navbar */} - - {/*
*/} - - - - - - this.handleClickToOpenOptions('edit')}> - this.handleClickToOpenOptions('add')}> - { Device.phone ? null : } - this.handleClickToOpenOptions('coauth')}> - this.handleClickToOpenOptions('settings')}> - - + + {showLogo &&
} + + + + {/* Page content */} @@ -94,7 +90,9 @@ export default class MainPage extends Component { } - + ) } -}; \ No newline at end of file +} + +export default inject("storeAppOptions")(observer(MainPage)); \ No newline at end of file diff --git a/apps/presentationeditor/mobile/src/view/Toolbar.jsx b/apps/presentationeditor/mobile/src/view/Toolbar.jsx new file mode 100644 index 000000000..89d0ebefa --- /dev/null +++ b/apps/presentationeditor/mobile/src/view/Toolbar.jsx @@ -0,0 +1,35 @@ +import React, {Fragment} from 'react'; +import {NavLeft, NavRight, NavTitle, Link, Icon} from 'framework7-react'; +import { Device } from '../../../../common/mobile/utils/device'; +import EditorUIController from '../lib/patch' + +const ToolbarView = props => { + return ( + + + {props.isShowBack && } + {props.isEdit && EditorUIController.getUndoRedo({ + disabledUndo: !props.isCanUndo, + disabledRedo: !props.isCanRedo, + onUndoClick: props.onUndo, + onRedoClick: props.onRedo + })} + + {!Device.phone && {props.docTitle}} + + + {props.isEdit && EditorUIController.getToolbarOptions({ + disabledAdd: props.disabledAdd || props.disabledControls, + disabledEdit: props.disabledEdit || props.disabledControls, + onEditClick: () => props.openOptions('edit'), + onAddClick: () => props.openOptions('add') + })} + { Device.phone ? null : } + {props.displayCollaboration && props.openOptions('coauth')}>} + props.openOptions('settings')}> + + + ) +}; + +export default ToolbarView; \ No newline at end of file From 9e753e6962391f96390dd88c9ee9c5f73b3d06d9 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 15 Apr 2021 12:43:24 +0300 Subject: [PATCH 06/23] [mobile] Fix error --- vendor/framework7-react/build/webpack.config.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vendor/framework7-react/build/webpack.config.js b/vendor/framework7-react/build/webpack.config.js index 9149edcf8..426a85f41 100644 --- a/vendor/framework7-react/build/webpack.config.js +++ b/vendor/framework7-react/build/webpack.config.js @@ -79,6 +79,8 @@ module.exports = { resolvePath('node_modules/ssr-window'), resolvePath('../../../web-apps-mobile/word'), + resolvePath('../../../web-apps-mobile/slide'), + resolvePath('../../../web-apps-mobile/cell') ], }, From 8912a1feabee616c693862fc90b9eaf2098f1784 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 15 Apr 2021 13:06:10 +0300 Subject: [PATCH 07/23] [PE mobile] Add files for preview --- .../mobile/src/controller/Preview.jsx | 17 +++++++++++++++++ .../presentationeditor/mobile/src/page/main.jsx | 12 +++++++++++- .../mobile/src/view/Preview.jsx | 10 ++++++++++ .../mobile/src/view/Toolbar.jsx | 2 +- 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 apps/presentationeditor/mobile/src/controller/Preview.jsx create mode 100644 apps/presentationeditor/mobile/src/view/Preview.jsx diff --git a/apps/presentationeditor/mobile/src/controller/Preview.jsx b/apps/presentationeditor/mobile/src/controller/Preview.jsx new file mode 100644 index 000000000..babf81120 --- /dev/null +++ b/apps/presentationeditor/mobile/src/controller/Preview.jsx @@ -0,0 +1,17 @@ +import React, { useEffect, useState } from 'react'; +import { inject } from 'mobx-react'; +import { f7 } from 'framework7-react'; +import { useTranslation } from 'react-i18next'; +import Preview from "../view/Preview"; + +const PreviewController = () => { + console.log('preview'); + return ( + + ) +}; + +export {PreviewController as Preview}; + + + diff --git a/apps/presentationeditor/mobile/src/page/main.jsx b/apps/presentationeditor/mobile/src/page/main.jsx index 9f80b19cb..e5e86581a 100644 --- a/apps/presentationeditor/mobile/src/page/main.jsx +++ b/apps/presentationeditor/mobile/src/page/main.jsx @@ -6,6 +6,7 @@ import EditOptions from '../view/edit/Edit'; import AddOptions from '../view/add/Add'; import Settings from '../view/settings/Settings'; import CollaborationView from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx'; +import { Preview } from "../controller/Preview"; import { Search, SearchSettings } from '../controller/Search'; import ContextMenu from '../controller/ContextMenu'; import { Toolbar } from "../controller/Toolbar"; @@ -18,6 +19,7 @@ class MainPage extends Component { addOptionsVisible: false, settingsVisible: false, collaborationVisible: false, + previewVisible: false }; } @@ -35,7 +37,9 @@ class MainPage extends Component { else if ( opts == 'settings' ) return {settingsVisible: true}; else if ( opts == 'coauth' ) - return {collaborationVisible: true} + return {collaborationVisible: true}; + else if ( opts == 'preview' ) + return {previewVisible: true}; }); }; @@ -50,6 +54,8 @@ class MainPage extends Component { return {settingsVisible: false}; else if ( opts == 'coauth' ) return {collaborationVisible: false} + else if ( opts == 'preview' ) + return {previewVisible: false}; }) })(); }; @@ -89,6 +95,10 @@ class MainPage extends Component { !this.state.collaborationVisible ? null : } + { + !this.state.previewVisible ? null : + + } ) diff --git a/apps/presentationeditor/mobile/src/view/Preview.jsx b/apps/presentationeditor/mobile/src/view/Preview.jsx new file mode 100644 index 000000000..5faae5f1a --- /dev/null +++ b/apps/presentationeditor/mobile/src/view/Preview.jsx @@ -0,0 +1,10 @@ +import React from 'react'; + +const Preview = () => { + return ( + <> + + ) +}; + +export default Preview; \ No newline at end of file diff --git a/apps/presentationeditor/mobile/src/view/Toolbar.jsx b/apps/presentationeditor/mobile/src/view/Toolbar.jsx index 89d0ebefa..8251fd2b0 100644 --- a/apps/presentationeditor/mobile/src/view/Toolbar.jsx +++ b/apps/presentationeditor/mobile/src/view/Toolbar.jsx @@ -17,7 +17,7 @@ const ToolbarView = props => { {!Device.phone && {props.docTitle}} - + {props.openOptions('preview')}}> {props.isEdit && EditorUIController.getToolbarOptions({ disabledAdd: props.disabledAdd || props.disabledControls, disabledEdit: props.disabledEdit || props.disabledControls, From c49fc13b80f3b8b4c38cd0f4b7112c6f68a4842e Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 15 Apr 2021 15:42:51 +0300 Subject: [PATCH 08/23] [DE mobile] Fix show context menu items for view mode --- .../mobile/src/controller/ContextMenu.jsx | 78 ++++++++++++++----- 1 file changed, 60 insertions(+), 18 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/ContextMenu.jsx b/apps/documenteditor/mobile/src/controller/ContextMenu.jsx index aedb54c99..978afa679 100644 --- a/apps/documenteditor/mobile/src/controller/ContextMenu.jsx +++ b/apps/documenteditor/mobile/src/controller/ContextMenu.jsx @@ -73,17 +73,27 @@ class ContextMenu extends ContextMenuController { case 'cut': if ( !LocalStorage.getBool("de-hide-copy-cut-paste-warning") ) this.showCopyCutPasteModal(); - break; case 'copy': - if ( !LocalStorage.getBool("de-hide-copy-cut-paste-warning") ) + if (!api.Copy() && !LocalStorage.getBool("de-hide-copy-cut-paste-warning") ) this.showCopyCutPasteModal(); - break; case 'paste': if ( !LocalStorage.getBool("de-hide-copy-cut-paste-warning") ) this.showCopyCutPasteModal(); - + break; + case 'viewcomment': + Common.Notifications.trigger('viewcomment'); + break; + case 'openlink': + const stack = api.getSelectedElements(); + let value; + stack.forEach((item) => { + if (item.get_ObjectType() == Asc.c_oAscTypeSelectElement.Hyperlink) { + value = item.get_ObjectValue().get_Value(); + } + }); + value && this.openLink(value); break; case 'review': setTimeout(() => { @@ -95,19 +105,6 @@ class ContextMenu extends ContextMenuController { this.props.openOptions('coauth', 'cm-review-change'); }, 400); break; - case 'split': - this.showSplitModal(); - break; - case 'edit': - setTimeout(() => { - this.props.openOptions('edit'); - }, 0); - break; - case 'addlink': - setTimeout(() => { - this.props.openOptions('add', 'link'); - }, 400); - break; } console.log("click context menu item: " + action); @@ -206,8 +203,53 @@ class ContextMenu extends ContextMenuController { initMenuItems() { if ( !Common.EditorApi ) return []; + const { isEdit } = this.props; - return EditorUIController.ContextMenu.mapMenuItems(this); + if (isEdit) { + return EditorUIController.ContextMenu.mapMenuItems(this); + } else { + const { t } = this.props; + const _t = t("ContextMenu", {returnObjects: true}); + const { canViewComments } = this.props; + + const api = Common.EditorApi.get(); + const stack = api.getSelectedElements(); + const canCopy = api.can_CopyCut(); + + let itemsIcon = [], + itemsText = []; + + if ( canCopy ) { + itemsIcon.push({ + event: 'copy', + icon: 'icon-copy' + }); + } + + if ( canViewComments && this.isComments ) { + itemsText.push({ + caption: _t.menuViewComment, + event: 'viewcomment' + }); + } + + let isLink = false; + stack.forEach(item => { + const objectType = item.get_ObjectType(); + if ( objectType === Asc.c_oAscTypeSelectElement.Hyperlink ) { + isLink = true; + } + }); + + if ( isLink ) { + itemsText.push({ + caption: _t.menuOpenLink, + event: 'openlink' + }); + } + + return itemsIcon.concat(itemsText); + } } initExtraItems () { From fe1a9e16d3c18cb5e9c2cc1aa512649c348aa283 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Fri, 16 Apr 2021 13:34:05 +0300 Subject: [PATCH 09/23] [PE mobile] Changes for private branch --- .../mobile/src/controller/ContextMenu.jsx | 217 ++++++------------ .../mobile/src/controller/Main.jsx | 82 +------ .../mobile/src/store/focusObjects.js | 137 +---------- 3 files changed, 82 insertions(+), 354 deletions(-) diff --git a/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx b/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx index 0db776dcc..b4680f6a0 100644 --- a/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx +++ b/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx @@ -7,6 +7,7 @@ import { LocalStorage } from '../../../../common/mobile/utils/LocalStorage'; import ContextMenuController from '../../../../common/mobile/lib/controller/ContextMenu'; import { idContextMenuElement } from '../../../../common/mobile/lib/view/ContextMenu'; import { Device } from '../../../../common/mobile/utils/device'; +import EditorUIController from '../lib/patch'; @inject ( stores => ({ isEdit: stores.storeAppOptions.isEdit, @@ -57,10 +58,13 @@ class ContextMenu extends ContextMenuController { onMenuItemClick(action) { super.onMenuItemClick(action); + if ( EditorUIController.ContextMenu.handleMenuItemClick(this, action) ) + return; + const api = Common.EditorApi.get(); switch (action) { case 'cut': - if (!api.Cut() && !LocalStorage.getBool("pe-hide-copy-cut-paste-warning")) { + if ( !LocalStorage.getBool("pe-hide-copy-cut-paste-warning")) { this.showCopyCutPasteModal(); } break; @@ -70,29 +74,13 @@ class ContextMenu extends ContextMenuController { } break; case 'paste': - if (!api.Paste() && !LocalStorage.getBool("pe-hide-copy-cut-paste-warning")) { + if ( !LocalStorage.getBool("pe-hide-copy-cut-paste-warning")) { this.showCopyCutPasteModal(); } break; - case 'addcomment': - Common.Notifications.trigger('addcomment'); - break; case 'viewcomment': Common.Notifications.trigger('viewcomment'); break; - case 'delete': - api.asc_Remove(); - break; - case 'edit': - setTimeout(() => { - this.props.openOptions('edit'); - }, 0); - break; - case 'addlink': - setTimeout(() => { - this.props.openOptions('add', 'link'); - }, 400) - break; case 'openlink': const stack = Common.EditorApi.get().getSelectedElements(); let value; @@ -104,8 +92,6 @@ class ContextMenu extends ContextMenuController { value && this.openLink(value); break; } - - console.log("click context menu item: " + action); } showCopyCutPasteModal() { @@ -154,152 +140,77 @@ class ContextMenu extends ContextMenuController { initMenuItems() { if ( !Common.EditorApi ) return []; - const { t } = this.props; - const _t = t("ContextMenu", { returnObjects: true }); + const { isEdit } = this.props; - const { isEdit, canViewComments, isDisconnected } = this.props; + if (isEdit) { + return EditorUIController.ContextMenu.mapMenuItems(this); + } else { + const { t } = this.props; + const _t = t("ContextMenu", { returnObjects: true }); - const api = Common.EditorApi.get(); - const stack = api.getSelectedElements(); - const canCopy = api.can_CopyCut(); + const { canViewComments, isDisconnected } = this.props; - let itemsIcon = [], - itemsText = []; + const api = Common.EditorApi.get(); + const stack = api.getSelectedElements(); + const canCopy = api.can_CopyCut(); - let isText = false, - isTable = false, - isImage = false, - isChart = false, - isShape = false, - isLink = false, - isSlide = false, - isObject = false; + let itemsIcon = [], + itemsText = []; - stack.forEach(item => { - const objectType = item.get_ObjectType(), - objectValue = item.get_ObjectValue(); + let isText = false, + isTable = false, + isImage = false, + isChart = false, + isShape = false, + isLink = false, + isSlide = false, + isObject = false; - if (objectType == Asc.c_oAscTypeSelectElement.Paragraph) { - isText = true; - } else if (objectType == Asc.c_oAscTypeSelectElement.Image) { - isImage = true; - } else if (objectType == Asc.c_oAscTypeSelectElement.Chart) { - isChart = true; - } else if (objectType == Asc.c_oAscTypeSelectElement.Shape) { - isShape = true; - } else if (objectType == Asc.c_oAscTypeSelectElement.Table) { - isTable = true; - } else if (objectType == Asc.c_oAscTypeSelectElement.Hyperlink) { - isLink = true; - } else if (objectType == Asc.c_oAscTypeSelectElement.Slide) { - isSlide = true; - } - }); + stack.forEach(item => { + const objectType = item.get_ObjectType(), + objectValue = item.get_ObjectValue(); - isObject = isText || isImage || isChart || isShape || isTable; - - if (canCopy && isObject) { - itemsIcon.push({ - event: 'copy', - icon: 'icon-copy' - }); - } - if (canViewComments && this.isComments && !isEdit) { - itemsText.push({ - caption: _t.menuViewComment, - event: 'viewcomment' - }); - } - - if ( stack.length > 0 ) { - let topObject = stack[stack.length - 1], - topObjectType = topObject.get_ObjectType(), - topObjectValue = topObject.get_ObjectValue(), - objectLocked = typeof topObjectValue.get_Locked === 'function' ? topObjectValue.get_Locked() : false; - - !objectLocked && (objectLocked = typeof topObjectValue.get_LockDelete === 'function' ? topObjectValue.get_LockDelete() : false); - - const swapItems = function(items, indexBefore, indexAfter) { - items[indexAfter] = items.splice(indexBefore, 1, items[indexAfter])[0]; - }; - - if (!objectLocked && isEdit && !isDisconnected) { - if (canCopy && isObject) { - itemsIcon.push({ - event: 'cut', - icon: 'icon-cut' - }); - - // Swap 'Copy' and 'Cut' - swapItems(itemsIcon, 0, 1); + if (objectType == Asc.c_oAscTypeSelectElement.Paragraph) { + isText = true; + } else if (objectType == Asc.c_oAscTypeSelectElement.Image) { + isImage = true; + } else if (objectType == Asc.c_oAscTypeSelectElement.Chart) { + isChart = true; + } else if (objectType == Asc.c_oAscTypeSelectElement.Shape) { + isShape = true; + } else if (objectType == Asc.c_oAscTypeSelectElement.Table) { + isTable = true; + } else if (objectType == Asc.c_oAscTypeSelectElement.Hyperlink) { + isLink = true; + } else if (objectType == Asc.c_oAscTypeSelectElement.Slide) { + isSlide = true; } + }); + isObject = isText || isImage || isChart || isShape || isTable; + + if (canCopy && isObject) { itemsIcon.push({ - event: 'paste', - icon: 'icon-paste' + event: 'copy', + icon: 'icon-copy' }); - - if (isObject) - itemsText.push({ - caption: _t.menuDelete, - event: 'delete' - }); - - itemsText.push({ - caption: _t.menuEdit, - event: 'edit' - }); - - if (!isLink && api.can_AddHyperlink() !== false) { - itemsText.push({ - caption: _t.menuAddLink, - event: 'addlink' - }); - } - - if (this.isComments && canViewComments) { - itemsText.push({ - caption: _t.menuViewComment, - event: 'viewcomment' - }); - } - - const hideAddComment = (isText && isChart) || api.can_AddQuotedComment() === false || !canViewComments; - if (!hideAddComment) { - itemsText.push({ - caption: _t.menuAddComment, - event: 'addcomment' - }); - } } + if (canViewComments && this.isComments && !isEdit) { + itemsText.push({ + caption: _t.menuViewComment, + event: 'viewcomment' + }); + } + + if (isLink) { + itemsText.push({ + caption: _t.menuOpenLink, + event: 'openlink' + }); + } + + return itemsIcon.concat(itemsText); } - - if (isLink) { - itemsText.push({ - caption: _t.menuOpenLink, - event: 'openlink' - }); - } - - - if ( Device.phone && itemsText.length > 2 ) { - this.extraItems = itemsText.splice(2,itemsText.length, { - caption: _t.menuMore, - event: 'showActionSheet' - }); - } - - return itemsIcon.concat(itemsText); - // return [{ - // caption: 'Edit', - // event: 'edit' - // }, { - // caption: 'View', - // event: 'view' - // }, { - // icon: 'icon-paste', - // event: 'review' - // }]; } initExtraItems () { diff --git a/apps/presentationeditor/mobile/src/controller/Main.jsx b/apps/presentationeditor/mobile/src/controller/Main.jsx index cc4a858b9..60e7b6eda 100644 --- a/apps/presentationeditor/mobile/src/controller/Main.jsx +++ b/apps/presentationeditor/mobile/src/controller/Main.jsx @@ -144,6 +144,8 @@ class MainController extends Component { 'translate': t('Controller.Main.SDK', {returnObjects:true}) }); + Common.EditorApi = {get: () => this.api}; + this.appOptions = {}; this.bindEvents(); @@ -160,7 +162,6 @@ class MainController extends Component { Common.Gateway.appReady(); Common.Notifications.trigger('engineCreated', this.api); - Common.EditorApi = {get: () => this.api}; }, error => { console.log('promise failed ' + error); }); @@ -174,89 +175,30 @@ class MainController extends Component { } bindEvents() { - const me = this; // me.api.asc_registerCallback('asc_onError', _.bind(me.onError, me)); - me.api.asc_registerCallback('asc_onDocumentContentReady', me._onDocumentContentReady.bind(me)); - me.api.asc_registerCallback('asc_onOpenDocumentProgress', me._onOpenDocumentProgress.bind(me)); + this.api.asc_registerCallback('asc_onDocumentContentReady', this._onDocumentContentReady.bind(this)); + this.api.asc_registerCallback('asc_onOpenDocumentProgress', this._onOpenDocumentProgress.bind(this)); const storePresentationSettings = this.props.storePresentationSettings; - me.api.asc_registerCallback('asc_onPresentationSize', (width, height) => { + this.api.asc_registerCallback('asc_onPresentationSize', (width, height) => { storePresentationSettings.changeSizeIndex(width, height); }); - me.api.asc_registerCallback('asc_onSendThemeColorSchemes', (arr) => { + this.api.asc_registerCallback('asc_onSendThemeColorSchemes', (arr) => { storePresentationSettings.addSchemes(arr); }); - // api.asc_registerCallback('asc_onSendThemeColorSchemes', _.bind(this.onSendThemeColorSchemes, this)); - // me.api.asc_registerCallback('asc_onDocumentUpdateVersion', _.bind(me.onUpdateVersion, me)); - // me.api.asc_registerCallback('asc_onServerVersion', _.bind(me.onServerVersion, me)); - // me.api.asc_registerCallback('asc_onAdvancedOptions', _.bind(me.onAdvancedOptions, me)); - // me.api.asc_registerCallback('asc_onDocumentName', _.bind(me.onDocumentName, me)); - // me.api.asc_registerCallback('asc_onPrintUrl', _.bind(me.onPrintUrl, me)); - // me.api.asc_registerCallback('asc_onThumbnailsShow', _.bind(me.onThumbnailsShow, me)); - // me.api.asc_registerCallback('asc_onMeta', _.bind(me.onMeta, me)); + EditorUIController.initFocusObjects(this.props.storeFocusObjects); - const storeFocusObjects = this.props.storeFocusObjects; - const storeSlideSettings = this.props.storeSlideSettings; - - this.api.asc_registerCallback('asc_onFocusObject', objects => { - // console.log(objects); - storeFocusObjects.resetFocusObjects(objects); - }); - - this.api.asc_registerCallback('asc_onInitEditorStyles', themes => { - // console.log(themes); - storeSlideSettings.addArrayThemes(themes); - }); - - this.api.asc_registerCallback('asc_onUpdateThemeIndex', themeId => { - // console.log(themeId); - storeSlideSettings.changeSlideThemeIndex(themeId); - }); - - this.api.asc_registerCallback('asc_onUpdateLayout', layouts => { - // console.log(layouts); - storeSlideSettings.addArrayLayouts(layouts); - }); - - this.api.asc_registerCallback('asc_onSendThemeColors', (colors, standart_colors) => { - Common.Utils.ThemeColor.setColors(colors, standart_colors); - }); + EditorUIController.initEditorStyles(this.props.storeSlideSettings); // Text settings const storeTextSettings = this.props.storeTextSettings; - this.api.asc_registerCallback('asc_onInitEditorFonts', (fonts, select) => { - storeTextSettings.initEditorFonts(fonts, select); - }); - - this.api.asc_registerCallback('asc_onFontFamily', (font) => { - storeTextSettings.resetFontName(font); - }); - - this.api.asc_registerCallback('asc_onFontSize', (size) => { - storeTextSettings.resetFontSize(size); - }); - - this.api.asc_registerCallback('asc_onBold', (isBold) => { - storeTextSettings.resetIsBold(isBold); - }); - - this.api.asc_registerCallback('asc_onItalic', (isItalic) => { - storeTextSettings.resetIsItalic(isItalic); - }); - - this.api.asc_registerCallback('asc_onUnderline', (isUnderline) => { - storeTextSettings.resetIsUnderline(isUnderline); - }); - - this.api.asc_registerCallback('asc_onStrikeout', (isStrikeout) => { - storeTextSettings.resetIsStrikeout(isStrikeout); - }); + EditorUIController.initFonts(storeTextSettings); this.api.asc_registerCallback('asc_onVerticalAlign', (typeBaseline) => { storeTextSettings.resetTypeBaseline(typeBaseline); @@ -315,11 +257,7 @@ class MainController extends Component { // Table settings - const storeTableSettings = this.props.storeTableSettings; - - this.api.asc_registerCallback('asc_onInitTableTemplates', (templates) => { - storeTableSettings.initTableTemplates(templates); - }); + EditorUIController.initTableTemplates(this.props.storeTableSettings); // Chart settings diff --git a/apps/presentationeditor/mobile/src/store/focusObjects.js b/apps/presentationeditor/mobile/src/store/focusObjects.js index 4ad5bafc1..2a363150a 100644 --- a/apps/presentationeditor/mobile/src/store/focusObjects.js +++ b/apps/presentationeditor/mobile/src/store/focusObjects.js @@ -25,79 +25,15 @@ export class storeFocusObjects { } get settings() { - const _settings = []; - let no_text = true; - for (let object of this._focusObjects) { - const type = object.get_ObjectType(), - objectValue = object.get_ObjectValue(); - if (Asc.c_oAscTypeSelectElement.Paragraph == type) { - if ( !objectValue.get_Locked() ) - no_text = false; - } else if (Asc.c_oAscTypeSelectElement.Table == type) { - if ( !objectValue.get_Locked() ) { - _settings.push('table'); - no_text = false; - } - } else if (Asc.c_oAscTypeSelectElement.Slide == type) { - if ( !(objectValue.get_LockLayout() || objectValue.get_LockBackground() || objectValue.get_LockTransition() || objectValue.get_LockTiming() )) - _settings.push('slide'); - } else if (Asc.c_oAscTypeSelectElement.Image == type) { - if ( !objectValue.get_Locked() ) - _settings.push('image'); - } else if (Asc.c_oAscTypeSelectElement.Chart == type) { - if ( !objectValue.get_Locked() ) - _settings.push('chart'); - } else if (Asc.c_oAscTypeSelectElement.Shape == type && !objectValue.get_FromChart()) { - if ( !objectValue.get_Locked() ) { - _settings.push('shape'); - no_text = false; - } - } else if (Asc.c_oAscTypeSelectElement.Hyperlink == type) { - _settings.push('hyperlink'); - } - } - if (!no_text && _settings.indexOf('image') < 0) - _settings.unshift('text'); - const resultArr = _settings.filter((value, index, self) => self.indexOf(value) === index); //get uniq array - // Exclude hyperlink if text is locked - if (resultArr.indexOf('hyperlink') > -1 && resultArr.indexOf('text') < 0) { - resultArr.splice(resultArr.indexOf('hyperlink'), 1); - } - // Exclude shapes if chart exist - if (resultArr.indexOf('chart') > -1 && resultArr.indexOf('shape') > -1) { - resultArr.splice(resultArr.indexOf('shape'), 1); - } - return resultArr; + return !!this.intf ? this.intf.filterFocusObjects() : null; } get slideObject() { - const slides = []; - for (let object of this._focusObjects) { - if (object.get_ObjectType() === Asc.c_oAscTypeSelectElement.Slide) { - slides.push(object); - } - } - if (slides.length > 0) { - const object = slides[slides.length - 1]; // get top - return object.get_ObjectValue(); - } else { - return undefined; - } + return !!this.intf ? this.intf.getSlideObject() : null; } get paragraphObject() { - const paragraphs = []; - for (let object of this._focusObjects) { - if (object.get_ObjectType() === Asc.c_oAscTypeSelectElement.Paragraph) { - paragraphs.push(object); - } - } - if (paragraphs.length > 0) { - const object = paragraphs[paragraphs.length - 1]; // get top - return object.get_ObjectValue(); - } else { - return undefined; - } + return !!this.intf ? this.intf.getParagraphObject() : null; } get paragraphLocked() { @@ -111,48 +47,15 @@ export class storeFocusObjects { } get shapeObject() { - const shapes = []; - for (let object of this._focusObjects) { - if (object.get_ObjectType() === Asc.c_oAscTypeSelectElement.Shape) { - shapes.push(object); - } - } - if (shapes.length > 0) { - const object = shapes[shapes.length - 1]; // get top - return object.get_ObjectValue(); - } else { - return undefined; - } + return !!this.intf ? this.intf.getShapeObject() : null; } get imageObject() { - const images = []; - for (let object of this._focusObjects) { - if (object.get_ObjectType() == Asc.c_oAscTypeSelectElement.Image && object.get_ObjectValue()) { - images.push(object); - } - } - if (images.length > 0) { - const object = images[images.length - 1]; // get top - return object.get_ObjectValue(); - } else { - return undefined; - } + return !!this.intf ? this.intf.getImageObject() : null; } get tableObject() { - const tables = []; - for (let object of this._focusObjects) { - if (object.get_ObjectType() == Asc.c_oAscTypeSelectElement.Table) { - tables.push(object); - } - } - if (tables.length > 0) { - const object = tables[tables.length - 1]; // get top table - return object.get_ObjectValue(); - } else { - return undefined; - } + return !!this.intf ? this.intf.getTableObject() : null; } get isTableInStack() { @@ -165,34 +68,10 @@ export class storeFocusObjects { } get chartObject() { - const charts = []; - - for (let object of this._focusObjects) { - if (object.get_ObjectType() == Asc.c_oAscTypeSelectElement.Chart) { - charts.push(object); - } - } - - if (charts.length > 0) { - const object = charts[charts.length - 1]; // get top - return object.get_ObjectValue(); - } else { - return undefined; - } + return !!this.intf ? this.intf.getChartObject() : null; } get linkObject() { - const links = []; - for (let object of this._focusObjects) { - if (object.get_ObjectType() == Asc.c_oAscTypeSelectElement.Hyperlink) { - links.push(object); - } - } - if (links.length > 0) { - const object = links[links.length - 1]; // get top - return object.get_ObjectValue(); - } else { - return undefined; - } + return !!this.intf ? this.intf.getLinkObject() : null; } } \ No newline at end of file From 1466cd61e4d4c4ecf0f75c24a25d90e5ec0777a5 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 16 Apr 2021 17:03:28 +0300 Subject: [PATCH 10/23] [PE mobile] Added preview slides --- apps/presentationeditor/mobile/locale/en.json | 3 +- .../mobile/src/controller/Preview.jsx | 94 ++++++++++++++++++- .../mobile/src/page/main.jsx | 93 +++++++++--------- .../mobile/src/view/Preview.jsx | 5 +- 4 files changed, 147 insertions(+), 48 deletions(-) diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 2651a9ccf..bcf17b851 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -274,7 +274,8 @@ "textCaseSensitive": "Case Sensitive", "textHighlight": "Highlight Results", "textNoTextFound": "Text not Found", - "textSelectObjectToEdit": "Select object to edit" + "textSelectObjectToEdit": "Select object to edit", + "textFinalMessage": "The end of slide preview. Click to exit." } }, "Common": { diff --git a/apps/presentationeditor/mobile/src/controller/Preview.jsx b/apps/presentationeditor/mobile/src/controller/Preview.jsx index babf81120..b072f6638 100644 --- a/apps/presentationeditor/mobile/src/controller/Preview.jsx +++ b/apps/presentationeditor/mobile/src/controller/Preview.jsx @@ -4,8 +4,98 @@ import { f7 } from 'framework7-react'; import { useTranslation } from 'react-i18next'; import Preview from "../view/Preview"; -const PreviewController = () => { - console.log('preview'); +const PreviewController = props => { + const { t } = useTranslation(); + const _t = t('View.Edit', {returnObjects: true}) + + let _view, _touches, _touchStart, _touchEnd; + + _view = $$('#pe-preview'); + + useEffect(() => { + const onDocumentReady = () => { + const api = Common.EditorApi.get(); + + api.asc_registerCallback('asc_onEndDemonstration', onEndDemonstration); + api.DemonstrationEndShowMessage(_t.textFinalMessage); + }; + + show(); + onDocumentReady(); + + _view.on('touchstart', onTouchStart); + _view.on('touchmove', onTouchMove); + _view.on('touchend', onTouchEnd); + _view.on('click', onClick); + + return () => { + const api = Common.EditorApi.get(); + + api.asc_unregisterCallback('asc_onEndDemonstration', onEndDemonstration); + + _view.off('touchstart', onTouchStart); + _view.off('touchmove', onTouchMove); + _view.off('touchend', onTouchEnd); + _view.off('click', onClick); + }; + }, []); + + const show = () => { + const api = Common.EditorApi.get(); + api.StartDemonstration('presentation-preview', api.getCurrentPage()); + }; + + const onTouchStart = e => { + e.preventDefault(); + + _touches = []; + + for (let i = 0; i < e.touches.length; i++) { + _touches.push([e.touches[i].pageX, e.touches[i].pageY]); + } + _touchEnd = _touchStart = [e.touches[0].pageX, e.touches[0].pageY]; + }; + + const onTouchMove = e => { + e.preventDefault(); + + const api = Common.EditorApi.get(); + + _touchEnd = [e.touches[0].pageX, e.touches[0].pageY]; + + if (e.touches.length < 2 ) return; + + for (let i = 0; i < e.touches.length; i++) { + if (Math.abs(e.touches[i].pageX - _touches[i][0]) > 20 || Math.abs(e.touches[i].pageY - _touches[i][1]) > 20 ) { + api.EndDemonstration(); + break; + } + } + }; + + const onTouchEnd = e => { + e.preventDefault(); + + const api = Common.EditorApi.get(); + + if (_touchEnd[0] - _touchStart[0] > 20) + api.DemonstrationPrevSlide(); + else if (_touchStart[0] - _touchEnd[0] > 20) + api.DemonstrationNextSlide(); + }; + + const onClick = e => { + const api = Common.EditorApi.get(); + api.DemonstrationNextSlide(); + }; + + // API Handlers + + const onEndDemonstration = () => { + if(props.previewVisible) + props.onClosePreview(); + }; + return ( ) diff --git a/apps/presentationeditor/mobile/src/page/main.jsx b/apps/presentationeditor/mobile/src/page/main.jsx index e5e86581a..41ebdba85 100644 --- a/apps/presentationeditor/mobile/src/page/main.jsx +++ b/apps/presentationeditor/mobile/src/page/main.jsx @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import React, { Component, Fragment } from 'react'; import { Page, View, Navbar, Subnavbar, Icon } from 'framework7-react'; import { observer, inject } from "mobx-react"; @@ -10,7 +10,6 @@ import { Preview } from "../controller/Preview"; import { Search, SearchSettings } from '../controller/Search'; import ContextMenu from '../controller/ContextMenu'; import { Toolbar } from "../controller/Toolbar"; - class MainPage extends Component { constructor(props) { super(props); @@ -23,6 +22,10 @@ class MainPage extends Component { }; } + onClosePreview = () => { + this.setState({previewVisible: false}); + } + handleClickToOpenOptions = (opts, showOpts) => { ContextMenu.closeContextMenu(); @@ -60,49 +63,53 @@ class MainPage extends Component { })(); }; - render() { - const appOptions = this.props.storeAppOptions; - const config = appOptions.config; - const showLogo = !(appOptions.canBrandingExt && (config.customization && (config.customization.loaderName || config.customization.loaderLogo))); - return ( - - {/* Top Navbar */} - - {showLogo &&
} - - - - - - {/* Page content */} - + render() { + const appOptions = this.props.storeAppOptions; + const config = appOptions.config; + const showLogo = !(appOptions.canBrandingExt && (config.customization && (config.customization.loaderName || config.customization.loaderLogo))); - + return ( + + {this.state.previewVisible ? : null} + + {/* Top Navbar */} + + {showLogo &&
} + + + + + + {/* Page content */} + - { - !this.state.editOptionsVisible ? null : - - } - { - !this.state.addOptionsVisible ? null : - - } - { - !this.state.settingsVisible ? null : - - } - { - !this.state.collaborationVisible ? null : - - } - { - !this.state.previewVisible ? null : - - } - - - ) - } + + + { + !this.state.editOptionsVisible ? null : + + } + { + !this.state.addOptionsVisible ? null : + + } + { + !this.state.settingsVisible ? null : + + } + { + !this.state.collaborationVisible ? null : + + } + { + !this.state.previewVisible ? null : + + } + + + + ) + } } export default inject("storeAppOptions")(observer(MainPage)); \ No newline at end of file diff --git a/apps/presentationeditor/mobile/src/view/Preview.jsx b/apps/presentationeditor/mobile/src/view/Preview.jsx index 5faae5f1a..96a618b42 100644 --- a/apps/presentationeditor/mobile/src/view/Preview.jsx +++ b/apps/presentationeditor/mobile/src/view/Preview.jsx @@ -2,8 +2,9 @@ import React from 'react'; const Preview = () => { return ( - <> - +
+
+
) }; From 45a9058da461a9da67ccb389faad08bce8cbda55 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Fri, 16 Apr 2021 19:03:30 +0300 Subject: [PATCH 11/23] [DE PE mobile] Changes for private branch --- .../mobile/src/controller/ContextMenu.jsx | 4 +-- .../mobile/src/controller/Main.jsx | 25 ++++++------------- .../mobile/src/view/Toolbar.jsx | 4 +-- .../mobile/src/controller/ContextMenu.jsx | 4 +-- .../mobile/src/controller/Main.jsx | 21 ++++++---------- .../mobile/src/view/Toolbar.jsx | 4 +-- 6 files changed, 23 insertions(+), 39 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/ContextMenu.jsx b/apps/documenteditor/mobile/src/controller/ContextMenu.jsx index 978afa679..136679559 100644 --- a/apps/documenteditor/mobile/src/controller/ContextMenu.jsx +++ b/apps/documenteditor/mobile/src/controller/ContextMenu.jsx @@ -65,7 +65,7 @@ class ContextMenu extends ContextMenuController { onMenuItemClick(action) { super.onMenuItemClick(action); - if ( EditorUIController.ContextMenu.handleMenuItemClick(this, action) ) + if ( EditorUIController.ContextMenu && EditorUIController.ContextMenu.handleMenuItemClick(this, action) ) return; const api = Common.EditorApi.get(); @@ -205,7 +205,7 @@ class ContextMenu extends ContextMenuController { if ( !Common.EditorApi ) return []; const { isEdit } = this.props; - if (isEdit) { + if (isEdit && EditorUIController.ContextMenu) { return EditorUIController.ContextMenu.mapMenuItems(this); } else { const { t } = this.props; diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx index c08ce978b..061f1eae9 100644 --- a/apps/documenteditor/mobile/src/controller/Main.jsx +++ b/apps/documenteditor/mobile/src/controller/Main.jsx @@ -9,8 +9,6 @@ import {InitReviewController as ReviewController} from '../../../../common/mobil import { onAdvancedOptions } from './settings/Download.jsx'; import { CommentsController, - AddCommentController, - EditCommentController, ViewCommentsController } from "../../../../common/mobile/lib/controller/collaboration/Comments"; import About from '../../../../common/mobile/lib/view/About'; @@ -488,9 +486,7 @@ class MainController extends Component { this.api.asc_registerCallback('asc_onDocumentName', this.onDocumentName.bind(this)); this.api.asc_registerCallback('asc_onPrintUrl', this.onPrintUrl.bind(this)); - this.api.asc_registerCallback('asc_onSendThemeColors', (colors, standart_colors) => { - Common.Utils.ThemeColor.setColors(colors, standart_colors); - }); + EditorUIController.initThemeColors && EditorUIController.initThemeColors(); this.api.asc_registerCallback('asc_onDownloadUrl', this.onDownloadUrl.bind(this)); @@ -504,8 +500,8 @@ class MainController extends Component { //text settings const storeTextSettings = this.props.storeTextSettings; - EditorUIController.initFonts(storeTextSettings); - EditorUIController.initFocusObjects(this.props.storeFocusObjects); + EditorUIController.initFonts && EditorUIController.initFonts(storeTextSettings); + EditorUIController.initFocusObjects && EditorUIController.initFocusObjects(this.props.storeFocusObjects); this.api.asc_registerCallback('asc_onVerticalAlign', (typeBaseline) => { storeTextSettings.resetTypeBaseline(typeBaseline); @@ -543,19 +539,13 @@ class MainController extends Component { }); //paragraph settings - EditorUIController.initEditorStyles(this.props.storeParagraphSettings); + EditorUIController.initEditorStyles && EditorUIController.initEditorStyles(this.props.storeParagraphSettings); //table settings - EditorUIController.initTableTemplates(this.props.storeTableSettings); + EditorUIController.initTableTemplates && EditorUIController.initTableTemplates(this.props.storeTableSettings); //chart settings - const storeChartSettings = this.props.storeChartSettings; - const storeFocusObjects = this.props.storeFocusObjects; - this.api.asc_registerCallback('asc_onUpdateChartStyles', () => { - if (storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties()) { - storeChartSettings.updateChartStyles(this.api.asc_getChartPreviews(storeFocusObjects.chartObject.get_ChartProperties().getType())); - } - }); + EditorUIController.updateChartStyles && EditorUIController.updateChartStyles(this.props.storeChartSettings, this.props.storeFocusObjects); // Document Info @@ -782,8 +772,7 @@ class MainController extends Component { - - + {EditorUIController.getEditCommentControllers && EditorUIController.getEditCommentControllers()} ) diff --git a/apps/documenteditor/mobile/src/view/Toolbar.jsx b/apps/documenteditor/mobile/src/view/Toolbar.jsx index d73db145c..6dd921194 100644 --- a/apps/documenteditor/mobile/src/view/Toolbar.jsx +++ b/apps/documenteditor/mobile/src/view/Toolbar.jsx @@ -9,7 +9,7 @@ const ToolbarView = props => { {props.isShowBack && } - {props.isEdit && EditorUIController.getUndoRedo({ + {props.isEdit && EditorUIController.getUndoRedo && EditorUIController.getUndoRedo({ disabledUndo: !props.isCanUndo, disabledRedo: !props.isCanRedo, onUndoClick: props.onUndo, @@ -18,7 +18,7 @@ const ToolbarView = props => { {!Device.phone && {props.docTitle}} - {props.isEdit && EditorUIController.getToolbarOptions({ + {props.isEdit && EditorUIController.getToolbarOptions && EditorUIController.getToolbarOptions({ disabled: disableEditBtn || props.disabledControls, onEditClick: e => props.openOptions('edit'), onAddClick: e => props.openOptions('add') diff --git a/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx b/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx index b4680f6a0..e72ce5d66 100644 --- a/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx +++ b/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx @@ -58,7 +58,7 @@ class ContextMenu extends ContextMenuController { onMenuItemClick(action) { super.onMenuItemClick(action); - if ( EditorUIController.ContextMenu.handleMenuItemClick(this, action) ) + if ( EditorUIController.ContextMenu && EditorUIController.ContextMenu.handleMenuItemClick(this, action) ) return; const api = Common.EditorApi.get(); @@ -142,7 +142,7 @@ class ContextMenu extends ContextMenuController { const { isEdit } = this.props; - if (isEdit) { + if (isEdit && EditorUIController.ContextMenu) { return EditorUIController.ContextMenu.mapMenuItems(this); } else { const { t } = this.props; diff --git a/apps/presentationeditor/mobile/src/controller/Main.jsx b/apps/presentationeditor/mobile/src/controller/Main.jsx index 60e7b6eda..8c5e89e0b 100644 --- a/apps/presentationeditor/mobile/src/controller/Main.jsx +++ b/apps/presentationeditor/mobile/src/controller/Main.jsx @@ -180,6 +180,8 @@ class MainController extends Component { this.api.asc_registerCallback('asc_onDocumentContentReady', this._onDocumentContentReady.bind(this)); this.api.asc_registerCallback('asc_onOpenDocumentProgress', this._onOpenDocumentProgress.bind(this)); + EditorUIController.initThemeColors && EditorUIController.initThemeColors(); + const storePresentationSettings = this.props.storePresentationSettings; this.api.asc_registerCallback('asc_onPresentationSize', (width, height) => { @@ -190,15 +192,15 @@ class MainController extends Component { storePresentationSettings.addSchemes(arr); }); - EditorUIController.initFocusObjects(this.props.storeFocusObjects); + EditorUIController.initFocusObjects && EditorUIController.initFocusObjects(this.props.storeFocusObjects); - EditorUIController.initEditorStyles(this.props.storeSlideSettings); + EditorUIController.initEditorStyles && EditorUIController.initEditorStyles(this.props.storeSlideSettings); // Text settings const storeTextSettings = this.props.storeTextSettings; - EditorUIController.initFonts(storeTextSettings); + EditorUIController.initFonts && EditorUIController.initFonts(storeTextSettings); this.api.asc_registerCallback('asc_onVerticalAlign', (typeBaseline) => { storeTextSettings.resetTypeBaseline(typeBaseline); @@ -257,17 +259,11 @@ class MainController extends Component { // Table settings - EditorUIController.initTableTemplates(this.props.storeTableSettings); + EditorUIController.initTableTemplates && EditorUIController.initTableTemplates(this.props.storeTableSettings); // Chart settings - const storeChartSettings = this.props.storeChartSettings; - - this.api.asc_registerCallback('asc_onUpdateChartStyles', () => { - if (storeFocusObjects.chartObject) { - storeChartSettings.updateChartStyles(this.api.asc_getChartPreviews(storeFocusObjects.chartObject.getType())); - } - }); + EditorUIController.updateChartStyles && EditorUIController.updateChartStyles(this.props.storeChartSettings, this.props.storeFocusObjects); } _onDocumentContentReady() { @@ -304,8 +300,7 @@ class MainController extends Component { - - + {EditorUIController.getEditCommentControllers && EditorUIController.getEditCommentControllers()} ) diff --git a/apps/presentationeditor/mobile/src/view/Toolbar.jsx b/apps/presentationeditor/mobile/src/view/Toolbar.jsx index 8251fd2b0..a97919f9e 100644 --- a/apps/presentationeditor/mobile/src/view/Toolbar.jsx +++ b/apps/presentationeditor/mobile/src/view/Toolbar.jsx @@ -8,7 +8,7 @@ const ToolbarView = props => { {props.isShowBack && } - {props.isEdit && EditorUIController.getUndoRedo({ + {props.isEdit && EditorUIController.getUndoRedo && EditorUIController.getUndoRedo({ disabledUndo: !props.isCanUndo, disabledRedo: !props.isCanRedo, onUndoClick: props.onUndo, @@ -18,7 +18,7 @@ const ToolbarView = props => { {!Device.phone && {props.docTitle}} {props.openOptions('preview')}}> - {props.isEdit && EditorUIController.getToolbarOptions({ + {props.isEdit && EditorUIController.getToolbarOptions && EditorUIController.getToolbarOptions({ disabledAdd: props.disabledAdd || props.disabledControls, disabledEdit: props.disabledEdit || props.disabledControls, onEditClick: () => props.openOptions('edit'), From c7b2a9813d7ac39ffa7e4180e7f5534010342a8a Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Mon, 19 Apr 2021 19:09:15 +0300 Subject: [PATCH 12/23] [PE mobile] Refactoring preview --- apps/presentationeditor/mobile/src/controller/Preview.jsx | 3 +-- apps/presentationeditor/mobile/src/page/main.jsx | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/apps/presentationeditor/mobile/src/controller/Preview.jsx b/apps/presentationeditor/mobile/src/controller/Preview.jsx index b072f6638..df6cd83aa 100644 --- a/apps/presentationeditor/mobile/src/controller/Preview.jsx +++ b/apps/presentationeditor/mobile/src/controller/Preview.jsx @@ -92,8 +92,7 @@ const PreviewController = props => { // API Handlers const onEndDemonstration = () => { - if(props.previewVisible) - props.onClosePreview(); + props.onclosed(); }; return ( diff --git a/apps/presentationeditor/mobile/src/page/main.jsx b/apps/presentationeditor/mobile/src/page/main.jsx index 41ebdba85..4739278e2 100644 --- a/apps/presentationeditor/mobile/src/page/main.jsx +++ b/apps/presentationeditor/mobile/src/page/main.jsx @@ -70,7 +70,7 @@ class MainPage extends Component { return ( - {this.state.previewVisible ? : null} + {!this.state.previewVisible ? null : } {/* Top Navbar */} @@ -101,10 +101,6 @@ class MainPage extends Component { !this.state.collaborationVisible ? null : } - { - !this.state.previewVisible ? null : - - } From 3dd26e178b8a8a6b85613af230ce75822e42b1f3 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 20 Apr 2021 12:47:57 +0300 Subject: [PATCH 13/23] [common] switch off version compare for debug --- apps/common/mobile/lib/view/About.jsx | 1 + apps/documenteditor/mobile/src/controller/Main.jsx | 2 +- vendor/framework7-react/build/webpack.config.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/common/mobile/lib/view/About.jsx b/apps/common/mobile/lib/view/About.jsx index cb6035fa7..a2fc8d61f 100644 --- a/apps/common/mobile/lib/view/About.jsx +++ b/apps/common/mobile/lib/view/About.jsx @@ -120,6 +120,7 @@ const PageAbout = props => { const About = inject("storeAppOptions")(observer(PageAbout)); About.appVersion = () => (__PRODUCT_VERSION__); +About.compareVersions = () => /d$/.test(__PRODUCT_VERSION__); export default About; \ No newline at end of file diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx index 061f1eae9..849e4760d 100644 --- a/apps/documenteditor/mobile/src/controller/Main.jsx +++ b/apps/documenteditor/mobile/src/controller/Main.jsx @@ -467,7 +467,7 @@ class MainController extends Component { if (this.changeServerVersion) return true; const _t = this._t; - if (About.appVersion() !== buildVersion && !window.compareVersions) { + if (About.appVersion() !== buildVersion && !About.compareVersions()) { this.changeServerVersion = true; f7.dialog.alert( _t.errorServerVersion, diff --git a/vendor/framework7-react/build/webpack.config.js b/vendor/framework7-react/build/webpack.config.js index 10daaf441..d0ca26d72 100644 --- a/vendor/framework7-react/build/webpack.config.js +++ b/vendor/framework7-react/build/webpack.config.js @@ -160,7 +160,7 @@ module.exports = { new webpack.DefinePlugin({ 'process.env.NODE_ENV': JSON.stringify(env), 'process.env.TARGET': JSON.stringify(target), - __PRODUCT_VERSION__: JSON.stringify(process.env.PRODUCT_VERSION ? process.env.PRODUCT_VERSION : '6.2.0'), + __PRODUCT_VERSION__: JSON.stringify(process.env.PRODUCT_VERSION ? process.env.PRODUCT_VERSION : '6.2.0d'), __PUBLISHER_ADDRESS__: JSON.stringify('20A-12 Ernesta Birznieka-Upisha street, Riga, Latvia, EU, LV-1050'), __SUPPORT_EMAIL__: JSON.stringify('support@onlyoffice.com'), __PUBLISHER_PHONE__: JSON.stringify('+371 633-99867'), From 57043e6602f1b01ad9ab77d34be3019bf98cd5a5 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 20 Apr 2021 19:49:49 +0300 Subject: [PATCH 14/23] [DE mobile] Changes related to main controller --- apps/documenteditor/mobile/locale/en.json | 3 +- .../mobile/src/controller/Error.jsx | 7 ++--- .../mobile/src/controller/LongActions.jsx | 4 +-- .../mobile/src/controller/Main.jsx | 29 +++++++++++++++++-- .../src/controller/settings/Download.jsx | 10 +++++-- 5 files changed, 41 insertions(+), 12 deletions(-) diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 9ca0208b9..7e4fee34d 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -94,7 +94,8 @@ "errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "errorDefaultMessage": "Error code: %1", "criticalErrorExtText": "Press 'OK' to back to document list.", - "notcriticalErrorTitle": "Warning" + "notcriticalErrorTitle": "Warning", + "scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page." }, "LongActions": { "openTitleText": "Opening Document", diff --git a/apps/documenteditor/mobile/src/controller/Error.jsx b/apps/documenteditor/mobile/src/controller/Error.jsx index 6ae81ef0d..ff499f251 100644 --- a/apps/documenteditor/mobile/src/controller/Error.jsx +++ b/apps/documenteditor/mobile/src/controller/Error.jsx @@ -1,8 +1,7 @@ -import React, { useEffect, useState } from 'react'; +import React, { useEffect } from 'react'; import { inject } from 'mobx-react'; import { f7 } from 'framework7-react'; import { useTranslation } from 'react-i18next'; -import LongActionsController from "./LongActions"; const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocument}) => { const {t} = useTranslation(); @@ -22,7 +21,7 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu if (id === Asc.c_oAscError.ID.LoadingScriptError) { f7.notification.create({ title: _t.criticalErrorTitle, - text: _t.criticalErrorTitle, + text: _t.scriptLoadError, closeButton: true }).open(); return; @@ -183,7 +182,7 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu // report only critical errors Common.Gateway.reportError(id, config.msg); - config.title = this.criticalErrorTitle; + config.title = _t.criticalErrorTitle; if (storeAppOptions.canBackToFolder && !storeAppOptions.isDesktopApp) { config.msg += '

' + _t.criticalErrorExtText; diff --git a/apps/documenteditor/mobile/src/controller/LongActions.jsx b/apps/documenteditor/mobile/src/controller/LongActions.jsx index 2c2e0f9fb..5365f7264 100644 --- a/apps/documenteditor/mobile/src/controller/LongActions.jsx +++ b/apps/documenteditor/mobile/src/controller/LongActions.jsx @@ -20,7 +20,7 @@ class LongActions extends Component { } closePreloader() { - if (this.loadMask.el) { + if (this.loadMask && this.loadMask.el) { f7.dialog.close(this.loadMask.el); } } @@ -70,7 +70,7 @@ class LongActions extends Component { if (action) { this.setLongActionView(action) } else { - this.loadMask.el && this.loadMask.el.classList.contains('modal-in') && f7.dialog.close(this.loadMask.el); + this.loadMask && this.loadMask.el && this.loadMask.el.classList.contains('modal-in') && f7.dialog.close(this.loadMask.el); } } diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx index 061f1eae9..45e56bb10 100644 --- a/apps/documenteditor/mobile/src/controller/Main.jsx +++ b/apps/documenteditor/mobile/src/controller/Main.jsx @@ -189,6 +189,9 @@ class MainController extends Component { }; const onDocumentContentReady = () => { + if (this._isDocReady) + return; + const appOptions = this.props.storeAppOptions; const appSettings = this.props.storeApplicationSettings; @@ -327,8 +330,8 @@ class MainController extends Component { Common.Utils.Metric.setCurrentMetric(value); this.api.asc_SetDocumentUnits((value === Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value===Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter)); - //me.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(me.onDocumentModifiedChanged, me)); - //me.api.asc_registerCallback('asc_onDocumentCanSaveChanged', _.bind(me.onDocumentCanSaveChanged, me)); + this.api.asc_registerCallback('asc_onDocumentModifiedChanged', this.onDocumentModifiedChanged.bind(this)); + this.api.asc_registerCallback('asc_onDocumentCanSaveChanged', this.onDocumentCanSaveChanged.bind(this)); //if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType['BlockInteraction']})) { // me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], ApplyEditRights); @@ -342,6 +345,19 @@ class MainController extends Component { window.onunload = this.onUnload.bind(this); } + onDocumentModifiedChanged () { + const isModified = this.api.asc_isDocumentCanSave(); + if (this._state.isDocModified !== isModified) { + this._isDocReady && Common.Gateway.setDocumentModified(this.api.isDocumentModified()); + } + + this.updateWindowTitle(); + } + + onDocumentCanSaveChanged (isCanSave) { + // + } + onBeforeUnload () { LocalStorage.save(); @@ -485,6 +501,7 @@ class MainController extends Component { this.api.asc_registerCallback('asc_onServerVersion', this.onServerVersion.bind(this)); this.api.asc_registerCallback('asc_onDocumentName', this.onDocumentName.bind(this)); this.api.asc_registerCallback('asc_onPrintUrl', this.onPrintUrl.bind(this)); + this.api.asc_registerCallback('asc_onPrint', this.onPrint.bind(this)); EditorUIController.initThemeColors && EditorUIController.initThemeColors(); @@ -677,6 +694,14 @@ class MainController extends Component { } } + onPrint () { + if (!this.props.storeAppOptions.canPrint) return; + + if (this.api) + this.api.asc_Print(); + Common.component.Analytics.trackEvent('Print'); + } + onPrintUrl (url) { if (this.iframePrint) { this.iframePrint.parentNode.removeChild(this.iframePrint); diff --git a/apps/documenteditor/mobile/src/controller/settings/Download.jsx b/apps/documenteditor/mobile/src/controller/settings/Download.jsx index 5bf78d0ba..187b65c7b 100644 --- a/apps/documenteditor/mobile/src/controller/settings/Download.jsx +++ b/apps/documenteditor/mobile/src/controller/settings/Download.jsx @@ -55,6 +55,8 @@ class DownloadController extends Component { const DownloadWithTranslation = withTranslation()(DownloadController); const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, canRequestClose) => { + if ($$('.dlg-adv-options.modal-in').length > 0) return; + const api = Common.EditorApi.get(); if (type == Asc.c_oAscAdvancedOptionsID.TXT) { let picker; @@ -97,7 +99,8 @@ const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, canRequest '
' + '
' + '
', - buttons: buttons + buttons: buttons, + cssClass: 'dlg-adv-options' }).open(); dialog.on('opened', () => { picker = f7.picker.create({ @@ -122,7 +125,7 @@ const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, canRequest const password = document.getElementById('modal-password').value; api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(password)); //if (!me._isDocReady) { - //me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + //Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument); //} } }]; @@ -138,7 +141,8 @@ const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, canRequest text: _t.txtProtected, content: '
', - buttons: buttons + buttons: buttons, + cssClass: 'dlg-adv-options' }).open(); } }; From eb63c42891f64ccc5452050da85214d34a280627 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 20 Apr 2021 19:52:36 +0300 Subject: [PATCH 15/23] [PE mobile] Make main controller, add error controller, add controller for long actions --- apps/presentationeditor/mobile/locale/en.json | 103 +++- .../mobile/src/controller/Error.jsx | 222 +++++++ .../mobile/src/controller/LongActions.jsx | 192 ++++++ .../mobile/src/controller/Main.jsx | 559 ++++++++++++++++-- .../settings/ApplicationSettings.jsx | 17 +- .../mobile/src/page/app.jsx | 2 + 6 files changed, 1043 insertions(+), 52 deletions(-) create mode 100644 apps/presentationeditor/mobile/src/controller/Error.jsx create mode 100644 apps/presentationeditor/mobile/src/controller/LongActions.jsx diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index bcf17b851..a4aaae940 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -21,9 +21,110 @@ "Slide subtitle": "Slide subtitle", "Table": "Table", "Slide title": "Slide title" - } + }, + "closeButtonText": "Close File", + "advDRMOptions": "Protected File", + "advDRMPassword": "Password", + + "leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", + "titleLicenseExp": "License expired", + "warnLicenseExp": "Your license has expired. Please update your license and refresh the page.", + "errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.", + "titleServerVersion": "Editor updated", + "notcriticalErrorTitle": "Warning", + "errorOpensource": "Using the free Community version you can open documents for viewing only. To access mobile web editors, a commercial license is required.", + "warnLicenseLimitedNoAccess": "License expired. You have no access to document editing functionality. Please contact your administrator.", + "warnLicenseLimitedRenewed": "License needs to be renewed. You have a limited access to document editing functionality.
Please contact your administrator to get full access", + "warnLicenseExceeded": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact your administrator to learn more.", + "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.", + "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.", + "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", + "textBuyNow": "Visit website", + "textContactUs": "Contact sales", + "textNoLicenseTitle": "License limit reached", + "textPaidFeature": "Paid feature", + "textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader. Please contact our Sales Department to get a quote.", + "textClose": "Close", + + "errorProcessSaveResult": "Saving is failed.", + "criticalErrorTitle": "Error", + "warnProcessRightsChange": "You have been denied the right to edit the file.", + "errorAccessDeny": "You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.", + + "errorUpdateVersion": "The file version has been changed. The page will be reloaded.", + "titleUpdateVersion": "Version changed", + "textHasMacros": "The file contains automatic macros.
Do you want to run macros?", + "textRemember": "Remember my choice", + "textYes": "Yes", + "textNo": "No" } }, + "Error": { + "criticalErrorTitle": "Error", + "unknownErrorText": "Unknown error.", + "convertationTimeoutText": "Convertation timeout exceeded.", + "openErrorText": "An error has occurred while opening the file", + "saveErrorText": "An error has occurred while saving the file", + "downloadErrorText": "Download failed.", + "uploadImageSizeMessage": "Maximium image size limit exceeded.", + "uploadImageExtMessage": "Unknown image format.", + "uploadImageFileCountMessage": "No images uploaded.", + "splitMaxRowsErrorText": "The number of rows must be less than %1", + "splitMaxColsErrorText": "The number of columns must be less than %1", + "splitDividerErrorText": "The number of rows must be a divisor of %1", + "errorKeyEncrypt": "Unknown key descriptor", + "errorKeyExpire": "Key descriptor expired", + "errorUsersExceed": "Count of users was exceed", + "errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download until the connection is restored and page is reloaded.", + "errorFilePassProtect": "The file is password protected and could not be opened.", + "errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:
opening price, max price, min price, closing price.", + "errorDataRange": "Incorrect data range.", + "errorDatabaseConnection": "External error.
Database connection error. Please, contact support.", + "errorUserDrop": "The file cannot be accessed right now.", + "errorConnectToServer": " The document could not be saved. Please check connection settings or contact your administrator.
When you click the 'OK' button, you will be prompted to download the document.", + "errorBadImageUrl": "Image url is incorrect", + "errorSessionAbsolute": "The document editing session has expired. Please reload the page.", + "errorSessionIdle": "The document has not been edited for quite a long time. Please reload the page.", + "errorSessionToken": "The connection to the server has been interrupted. Please reload the page.", + "errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", + "errorAccessDeny": "You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.", + "errorEditingDownloadas": "An error occurred during the work with the document.
Use the 'Download' option to save the file backup copy to your computer hard drive.", + "errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.", + "errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", + "errorDefaultMessage": "Error code: %1", + "criticalErrorExtText": "Press 'OK' to back to document list.", + "notcriticalErrorTitle": "Warning", + "scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page." + }, + "LongActions": { + "openTitleText": "Opening Document", + "openTextText": "Opening document...", + "saveTitleText": "Saving Document", + "saveTextText": "Saving document...", + "loadFontsTitleText": "Loading Data", + "loadFontsTextText": "Loading data...", + "loadImagesTitleText": "Loading Images", + "loadImagesTextText": "Loading images...", + "loadFontTitleText": "Loading Data", + "loadFontTextText": "Loading data...", + "loadImageTitleText": "Loading Image", + "loadImageTextText": "Loading image...", + "downloadTitleText": "Downloading Document", + "downloadTextText": "Downloading document...", + "printTitleText": "Printing Document", + "printTextText": "Printing document...", + "uploadImageTitleText": "Uploading Image", + "uploadImageTextText": "Uploading image...", + "applyChangesTitleText": "Loading Data", + "applyChangesTextText": "Loading data...", + "savePreparingText": "Preparing to save", + "savePreparingTitle": "Preparing to save. Please wait...", + "waitText": "Please, wait...", + "txtEditingMode": "Set editing mode...", + "loadingDocumentTitleText": "Loading document", + "loadingDocumentTextText": "Loading document...", + "textLoadingDocument": "Loading document" + }, "ContextMenu": { "menuViewComment": "View Comment", "menuAddComment": "Add Comment", diff --git a/apps/presentationeditor/mobile/src/controller/Error.jsx b/apps/presentationeditor/mobile/src/controller/Error.jsx new file mode 100644 index 000000000..a8cd9213e --- /dev/null +++ b/apps/presentationeditor/mobile/src/controller/Error.jsx @@ -0,0 +1,222 @@ +import React, { useEffect } from 'react'; +import { inject } from 'mobx-react'; +import { f7 } from 'framework7-react'; +import { useTranslation } from 'react-i18next'; + +const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocument}) => { + const {t} = useTranslation(); + const _t = t("Error", { returnObjects: true }); + + useEffect(() => { + Common.Notifications.on('engineCreated', (api) => { + api.asc_registerCallback('asc_onError', onError); + }); + return () => { + const api = Common.EditorApi.get(); + api.asc_unregisterCallback('asc_onError', onError); + } + }); + + const onError = (id, level, errData) => { + if (id === -82) return; // format error + + if (id === Asc.c_oAscError.ID.LoadingScriptError) { + f7.notification.create({ + title: _t.criticalErrorTitle, + text: _t.scriptLoadError, + closeButton: true + }).open(); + return; + } + + Common.Notifications.trigger('preloader:close'); + Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + + const api = Common.EditorApi.get(); + + const config = { + closable: false + }; + + switch (id) + { + case Asc.c_oAscError.ID.Unknown: + config.msg = _t.unknownErrorText; + break; + + case Asc.c_oAscError.ID.ConvertationTimeout: + config.msg = _t.convertationTimeoutText; + break; + + case Asc.c_oAscError.ID.ConvertationOpenError: + config.msg = _t.openErrorText; + break; + + case Asc.c_oAscError.ID.ConvertationSaveError: + config.msg = _t.saveErrorText; + break; + + case Asc.c_oAscError.ID.DownloadError: + config.msg = _t.downloadErrorText; + break; + + case Asc.c_oAscError.ID.UplImageSize: + config.msg = _t.uploadImageSizeMessage; + break; + + case Asc.c_oAscError.ID.UplImageExt: + config.msg = _t.uploadImageExtMessage; + break; + + case Asc.c_oAscError.ID.UplImageFileCount: + config.msg = _t.uploadImageFileCountMessage; + break; + + case Asc.c_oAscError.ID.SplitCellMaxRows: + config.msg = _t.splitMaxRowsErrorText.replace('%1', errData.get_Value()); + break; + + case Asc.c_oAscError.ID.SplitCellMaxCols: + config.msg = _t.splitMaxColsErrorText.replace('%1', errData.get_Value()); + break; + + case Asc.c_oAscError.ID.SplitCellRowsDivider: + config.msg = _t.splitDividerErrorText.replace('%1', errData.get_Value()); + break; + + case Asc.c_oAscError.ID.VKeyEncrypt: + config.msg = _t.errorKeyEncrypt; + break; + + case Asc.c_oAscError.ID.KeyExpire: + config.msg = _t.errorKeyExpire; + break; + + case Asc.c_oAscError.ID.UserCountExceed: + config.msg = _t.errorUsersExceed; + break; + + case Asc.c_oAscError.ID.CoAuthoringDisconnect: + config.msg = _t.errorViewerDisconnect; + break; + + case Asc.c_oAscError.ID.ConvertationPassword: + config.msg = _t.errorFilePassProtect; + break; + + case Asc.c_oAscError.ID.StockChartError: + config.msg = _t.errorStockChart; + break; + + case Asc.c_oAscError.ID.DataRangeError: + config.msg = _t.errorDataRange; + break; + + case Asc.c_oAscError.ID.Database: + config.msg = _t.errorDatabaseConnection; + break; + + case Asc.c_oAscError.ID.UserDrop: + const lostEditingRights = storeAppOptions.lostEditingRights; + if (lostEditingRights) { + storeAppOptions.changeEditingRights(false); + return; + } + storeAppOptions.changeEditingRights(true); + config.msg = _t.errorUserDrop; + break; + + case Asc.c_oAscError.ID.Warning: + config.msg = _t.errorConnectToServer; + break; + + case Asc.c_oAscError.ID.UplImageUrl: + config.msg = _t.errorBadImageUrl; + break; + + case Asc.c_oAscError.ID.SessionAbsolute: + config.msg = _t.errorSessionAbsolute; + break; + + case Asc.c_oAscError.ID.SessionIdle: + config.msg = _t.errorSessionIdle; + break; + + case Asc.c_oAscError.ID.SessionToken: + config.msg = _t.errorSessionToken; + break; + + case Asc.c_oAscError.ID.DataEncrypted: + config.msg = _t.errorDataEncrypted; + break; + + case Asc.c_oAscError.ID.AccessDeny: + config.msg = _t.errorAccessDeny; + break; + + case Asc.c_oAscError.ID.EditingError: + config.msg = _t.errorEditingDownloadas; + break; + + case Asc.c_oAscError.ID.ConvertationOpenLimitError: + config.msg = _t.errorFileSizeExceed; + break; + + case Asc.c_oAscError.ID.UpdateVersion: + config.msg = _t.errorUpdateVersionOnDisconnect; + break; + + default: + config.msg = _t.errorDefaultMessage.replace('%1', id); + break; + } + + if (level === Asc.c_oAscError.Level.Critical) { + + // report only critical errors + Common.Gateway.reportError(id, config.msg); + + config.title = _t.criticalErrorTitle; + + if (storeAppOptions.canBackToFolder && !storeAppOptions.isDesktopApp) { + config.msg += '

' + _t.criticalErrorExtText; + config.callback = function() { + Common.Notifications.trigger('goback', true); + } + } + if (id === Asc.c_oAscError.ID.DataEncrypted) { + api.asc_coAuthoringDisconnect(); + Common.Notifications.trigger('api:disconnect'); + } + } + else { + Common.Gateway.reportWarning(id, config.msg); + + config.title = _t.notcriticalErrorTitle; + config.callback = (btn) => { + if (id === Asc.c_oAscError.ID.Warning && btn === 'ok' && (storeAppOptions.canDownload || storeAppOptions.canDownloadOrigin)) { + api.asc_DownloadOrigin(); + } + storeAppOptions.changeEditingRights(false); + }; + } + + f7.dialog.create({ + cssClass: 'error-dialog', + title : config.title, + text : config.msg, + buttons: [ + { + text: 'OK', + onClick: config.callback + } + ] + }).open(); + + Common.component.Analytics.trackEvent('Internal Error', id.toString()); + }; + + return null +}); + +export default ErrorController; \ No newline at end of file diff --git a/apps/presentationeditor/mobile/src/controller/LongActions.jsx b/apps/presentationeditor/mobile/src/controller/LongActions.jsx new file mode 100644 index 000000000..0828925ab --- /dev/null +++ b/apps/presentationeditor/mobile/src/controller/LongActions.jsx @@ -0,0 +1,192 @@ +import React, { Component } from 'react'; +import { inject } from 'mobx-react'; +import { f7 } from 'framework7-react'; +import { withTranslation } from 'react-i18next'; +import IrregularStack from "../../../../common/mobile/utils/IrregularStack"; + +class LongActions extends Component { + constructor(props) { + super(props); + + this.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;} + }); + + this.onLongActionBegin = this.onLongActionBegin.bind(this); + this.onLongActionEnd = this.onLongActionEnd.bind(this); + this.onOpenDocument = this.onOpenDocument.bind(this); + this.closePreloader = this.closePreloader.bind(this); + } + + closePreloader() { + if (this.loadMask && this.loadMask.el) { + f7.dialog.close(this.loadMask.el); + } + } + + componentDidMount() { + Common.Notifications.on('engineCreated', (api) => { + api.asc_registerCallback('asc_onStartAction', this.onLongActionBegin); + api.asc_registerCallback('asc_onEndAction', this.onLongActionEnd); + api.asc_registerCallback('asc_onOpenDocumentProgress', this.onOpenDocument); + }); + Common.Notifications.on('preloader:endAction', this.onLongActionEnd); + Common.Notifications.on('preloader:beginAction', this.onLongActionBegin); + Common.Notifications.on('preloader:close', this.closePreloader); + } + + componentWillUnmount() { + const api = Common.EditorApi.get(); + api.asc_unregisterCallback('asc_onStartAction', this.onLongActionBegin); + api.asc_unregisterCallback('asc_onEndAction', this.onLongActionEnd); + api.asc_unregisterCallback('asc_onOpenDocumentProgress', this.onOpenDocument); + + Common.Notifications.off('preloader:endAction', this.onLongActionEnd); + Common.Notifications.off('preloader:beginAction', this.onLongActionBegin); + Common.Notifications.off('preloader:close', this.closePreloader); + } + + onLongActionBegin (type, id) { + const action = {id: id, type: type}; + this.stackLongActions.push(action); + this.setLongActionView(action); + } + + onLongActionEnd (type, id) { + let action = {id: id, type: type}; + this.stackLongActions.pop(action); + + //this.updateWindowTitle(true); + + action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information}); + + if (action) { + this.setLongActionView(action) + } + + action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction}); + + if (action) { + this.setLongActionView(action) + } else { + this.loadMask && this.loadMask.el && this.loadMask.el.classList.contains('modal-in') && f7.dialog.close(this.loadMask.el); + } + } + + setLongActionView (action) { + const { t } = this.props; + const _t = t("LongActions", { returnObjects: true }); + let title = ''; + let text = ''; + switch (action.id) { + case Asc.c_oAscAsyncAction['Open']: + title = _t.openTitleText; + text = _t.openTextText; + break; + + case Asc.c_oAscAsyncAction['Save']: + title = _t.saveTitleText; + text = _t.saveTextText; + break; + + case Asc.c_oAscAsyncAction['LoadDocumentFonts']: + title = _t.loadFontsTitleText; + text = _t.loadFontsTextText; + break; + + case Asc.c_oAscAsyncAction['LoadDocumentImages']: + title = _t.loadImagesTitleText; + text = _t.loadImagesTextText; + break; + + case Asc.c_oAscAsyncAction['LoadFont']: + title = _t.loadFontTitleText; + text = _t.loadFontTextText; + break; + + case Asc.c_oAscAsyncAction['LoadImage']: + title = _t.loadImageTitleText; + text = _t.loadImageTextText; + break; + + case Asc.c_oAscAsyncAction['DownloadAs']: + title = _t.downloadTitleText; + text = _t.downloadTextText; + break; + + case Asc.c_oAscAsyncAction['Print']: + title = _t.printTitleText; + text = _t.printTextText; + break; + + case Asc.c_oAscAsyncAction['UploadImage']: + title = _t.uploadImageTitleText; + text = _t.uploadImageTextText; + break; + + case Asc.c_oAscAsyncAction['ApplyChanges']: + title = _t.applyChangesTitleText; + text = _t.applyChangesTextText; + break; + + case Asc.c_oAscAsyncAction['PrepareToSave']: + title = _t.savePreparingText; + text = _t.savePreparingTitle; + break; + + case Asc.c_oAscAsyncAction['Waiting']: + title = _t.waitText; + text = _t.waitText; + break; + + case ApplyEditRights: + title = _t.txtEditingMode; + text = _t.txtEditingMode; + break; + + case LoadingDocument: + title = _t.loadingDocumentTitleText; + text = _t.loadingDocumentTextText; + break; + default: + if (typeof action.id == 'string'){ + title = action.id; + text = action.id; + } + break; + } + + if (action.type === Asc.c_oAscAsyncActionType['BlockInteraction']) { + if (action.id === Asc.c_oAscAsyncAction['ApplyChanges']) { + return; + } + + if (this.loadMask && this.loadMask.el && this.loadMask.el.classList.contains('modal-in')) { + this.loadMask.el.getElementsByClassName('dialog-title')[0].innerHTML = title; + } else { + this.loadMask = f7.dialog.preloader(title); + } + } + + } + + onOpenDocument (progress) { + if (this.loadMask && this.loadMask.el) { + const $title = this.loadMask.el.getElementsByClassName('dialog-title')[0]; + const proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount()); + + const { t } = this.props; + const _t = t("LongActions", { returnObjects: true }); + $title.innerHTML = `${_t.textLoadingDocument}: ${Math.min(Math.round(proc * 100), 100)}%`; + } + } + + render() { + return null; + } +} + +const LongActionsController = withTranslation()(LongActions); + +export default LongActionsController; \ No newline at end of file diff --git a/apps/presentationeditor/mobile/src/controller/Main.jsx b/apps/presentationeditor/mobile/src/controller/Main.jsx index 8c5e89e0b..aa626e48e 100644 --- a/apps/presentationeditor/mobile/src/controller/Main.jsx +++ b/apps/presentationeditor/mobile/src/controller/Main.jsx @@ -7,19 +7,44 @@ import CollaborationController from '../../../../common/mobile/lib/controller/co import EditorUIController from '../lib/patch'; import { CommentsController, - AddCommentController, - EditCommentController, ViewCommentsController } from "../../../../common/mobile/lib/controller/collaboration/Comments"; +import ErrorController from "./Error"; +import LongActionsController from "./LongActions"; +import {LocalStorage} from "../../../../common/mobile/utils/LocalStorage"; +import About from '../../../../common/mobile/lib/view/About'; -@inject("storeFocusObjects", "storeAppOptions", "storePresentationInfo", "storePresentationSettings", "storeSlideSettings", "storeTextSettings", "storeTableSettings", "storeChartSettings", "storeLinkSettings") +@inject( + "storeFocusObjects", + "storeAppOptions", + "storePresentationInfo", + "storePresentationSettings", + "storeSlideSettings", + "storeTextSettings", + "storeTableSettings", + "storeChartSettings", + "storeLinkSettings", + "storeApplicationSettings" + ) class MainController extends Component { - constructor(props) { + constructor (props) { super(props) window.editorType = 'pe'; + + this.LoadingDocument = -256; + + this._state = { + licenseType: false, + isDocModified: false + }; + + this.defaultTitleText = __APP_TITLE_TEXT__; + + const { t } = this.props; + this._t = t('Controller.Main', {returnObjects:true}); } - initSdk() { + initSdk () { const script = document.createElement("script"); script.src = "../../../../sdkjs/develop/sdkjs/slide/scripts.js"; script.async = true; @@ -54,7 +79,15 @@ class MainController extends Component { this.props.storeAppOptions.setConfigOptions(this.editorConfig); this.editorConfig.lang && this.api.asc_setLocale(this.editorConfig.lang); - // console.log(this.editorConfig); + + let value = LocalStorage.getItem("pe-mobile-macros-mode"); + if (value === null) { + value = this.editorConfig.customization ? this.editorConfig.customization.macrosMode : 'warn'; + value = (value === 'enable') ? 1 : (value === 'disable' ? 2 : 0); + } else { + value = parseInt(value); + } + this.props.storeApplicationSettings.changeMacrosSettings(value); }; const loadDocument = data => { @@ -85,15 +118,15 @@ class MainController extends Component { docInfo.put_Permissions(_permissions); docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys); - // var enable = !this.editorConfig.customization || (this.editorConfig.customization.macros!==false); - // docInfo.asc_putIsEnabledMacroses(!!enable); - // enable = !this.editorConfig.customization || (this.editorConfig.customization.plugins!==false); - // docInfo.asc_putIsEnabledPlugins(!!enable); + let enable = !this.editorConfig.customization || (this.editorConfig.customization.macros !== false); + docInfo.asc_putIsEnabledMacroses(!!enable); + enable = !this.editorConfig.customization || (this.editorConfig.customization.plugins !== false); + docInfo.asc_putIsEnabledPlugins(!!enable); } this.api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions); - // this.api.asc_registerCallback('asc_onLicenseChanged', _.bind(this.onLicenseChanged, this)); - // this.api.asc_registerCallback('asc_onRunAutostartMacroses', _.bind(this.onRunAutostartMacroses, this)); + this.api.asc_registerCallback('asc_onLicenseChanged', this.onLicenseChanged.bind(this)); + this.api.asc_registerCallback('asc_onRunAutostartMacroses', this.onRunAutostartMacroses.bind(this)); this.api.asc_setDocInfo(docInfo); this.api.asc_getEditorPermissions(this.editorConfig.licenseUrl, this.editorConfig.customerId); @@ -111,16 +144,16 @@ class MainController extends Component { }; const onEditorPermissions = params => { - let me = this; const licType = params.asc_getLicenseType(); - me.appOptions.canLicense = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit); + this.appOptions.canLicense = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit); - this.props.storeAppOptions.setPermissionOptions(this.document, licType, params, this.permissions); + const storeAppOptions = this.props.storeAppOptions; + storeAppOptions.setPermissionOptions(this.document, licType, params, this.permissions); + this.applyMode(storeAppOptions); - // me.api.asc_setViewMode(!me.appOptions.isEdit); - me.api.asc_setViewMode(false); - me.api.asc_LoadDocument(); + this.api.asc_LoadDocument(); + this.api.Resize(); }; const _process_array = (array, fn) => { @@ -144,24 +177,36 @@ class MainController extends Component { 'translate': t('Controller.Main.SDK', {returnObjects:true}) }); + Common.Notifications.trigger('engineCreated', this.api); Common.EditorApi = {get: () => this.api}; this.appOptions = {}; this.bindEvents(); - let value = null /*Common.localStorage.getItem("pe-settings-fontrender")*/; + let value = LocalStorage.getItem("pe-settings-fontrender"); if (value===null) value = window.devicePixelRatio > 1 ? '1' : '3'; this.api.SetFontRenderingMode(parseInt(value)); this.api.SetDrawingFreeze(true); this.api.SetThemesPath("../../../../sdkjs/slide/themes/"); - // Common.Utils.Metric.setCurrentMetric(1); //pt + Common.Utils.Metric.setCurrentMetric(1); //pt Common.Gateway.on('init', loadConfig); - // Common.Gateway.on('showmessage', _.bind(me.onExternalMessage, me)); + Common.Gateway.on('showmessage', this.onExternalMessage.bind(this)); Common.Gateway.on('opendocument', loadDocument); Common.Gateway.appReady(); - Common.Notifications.trigger('engineCreated', this.api); + Common.Gateway.on('internalcommand', function(data) { + if (data.command === 'hardBack') { + if ($$('.modal-in').length > 0) { + if ( !($$('.error-dialog.modal-in').length > 0) ) { + f7.dialog.close(); + } + Common.Gateway.internalMessage('hardBack', false); + } else + Common.Gateway.internalMessage('hardBack', true); + } + }); + Common.Gateway.internalMessage('listenHardBack'); }, error => { console.log('promise failed ' + error); }); @@ -174,11 +219,76 @@ class MainController extends Component { document.body.appendChild(script); } - bindEvents() { - - // me.api.asc_registerCallback('asc_onError', _.bind(me.onError, me)); - this.api.asc_registerCallback('asc_onDocumentContentReady', this._onDocumentContentReady.bind(this)); - this.api.asc_registerCallback('asc_onOpenDocumentProgress', this._onOpenDocumentProgress.bind(this)); + applyMode(appOptions) { + this.api.asc_enableKeyEvents(appOptions.isEdit); + this.api.asc_setViewMode(!appOptions.isEdit && !appOptions.isRestrictedEdit); + (appOptions.isRestrictedEdit && appOptions.canComments) && this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyComments); + + let value = LocalStorage.getItem('pe-mobile-settings-unit'); + value = (value !== null) ? + parseInt(value) : + (appOptions.customization && appOptions.customization.unit ? Common.Utils.Metric.c_MetricUnits[appOptions.customization.unit.toLocaleLowerCase()] : Common.Utils.Metric.getDefaultMetric()); + (value === undefined) && (value = Common.Utils.Metric.getDefaultMetric()); + Common.Utils.Metric.setCurrentMetric(value); + this.api.asc_SetDocumentUnits((value === Common.Utils.Metric.c_MetricUnits.inch) ? + Asc.c_oAscDocumentUnits.Inch : + ((value === Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter)); + + this.api.asc_registerCallback('asc_onDocumentModifiedChanged', this.onDocumentModifiedChanged.bind(this)); + this.api.asc_registerCallback('asc_onDocumentCanSaveChanged', this.onDocumentCanSaveChanged.bind(this)); + + //if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType['BlockInteraction']})) { + // me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], ApplyEditRights); + //} else if (!this._isDocReady) { + // me.hidePreloader(); + // me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + //} + + // Message on window close + window.onbeforeunload = this.onBeforeUnload.bind(this); + window.onunload = this.onUnload.bind(this); + } + + onDocumentModifiedChanged () { + const isModified = this.api.asc_isDocumentCanSave(); + if (this._state.isDocModified !== isModified) { + this._isDocReady && Common.Gateway.setDocumentModified(this.api.isDocumentModified()); + } + + this.updateWindowTitle(); + } + + onDocumentCanSaveChanged (isCanSave) { + // + } + + onBeforeUnload () { + LocalStorage.save(); + + if (this.api.isDocumentModified()) { + this.api.asc_stopSaving(); + this.continueSavingTimer = window.setTimeout(() => { + this.api.asc_continueSaving(); + }, 500); + + return this._t.leavePageText; + } + } + + onUnload () { + if (this.continueSavingTimer) + clearTimeout(this.continueSavingTimer); + } + + bindEvents () { + this.api.asc_registerCallback('asc_onDocumentContentReady', this.onDocumentContentReady.bind(this)); + this.api.asc_registerCallback('asc_onDocumentUpdateVersion', this.onUpdateVersion.bind(this)); + this.api.asc_registerCallback('asc_onServerVersion', this.onServerVersion.bind(this)); + this.api.asc_registerCallback('asc_onAdvancedOptions', this.onAdvancedOptions.bind(this)); + this.api.asc_registerCallback('asc_onDocumentName', this.onDocumentName.bind(this)); + this.api.asc_registerCallback('asc_onPrintUrl', this.onPrintUrl.bind(this)); + this.api.asc_registerCallback('asc_onPrint', this.onPrint.bind(this)); + this.api.asc_registerCallback('asc_onMeta', this.onMeta.bind(this)); EditorUIController.initThemeColors && EditorUIController.initThemeColors(); @@ -266,12 +376,48 @@ class MainController extends Component { EditorUIController.updateChartStyles && EditorUIController.updateChartStyles(this.props.storeChartSettings, this.props.storeFocusObjects); } - _onDocumentContentReady() { + onDocumentContentReady () { + if (this._isDocReady) + return; + + this._isDocReady = true; + + const appOptions = this.props.storeAppOptions; + const appSettings = this.props.storeApplicationSettings; + this.api.SetDrawingFreeze(false); + Common.Notifications.trigger('preloader:close'); + Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument); + + let value = LocalStorage.getItem("pe-settings-zoom"); + const zf = (value!==null) ? parseInt(value) : (appOptions.customization && appOptions.customization.zoom ? parseInt(appOptions.customization.zoom) : -1); + (zf === -1) ? this.api.zoomFitToPage() : ((zf === -2) ? this.api.zoomFitToWidth() : this.api.zoom(zf>0 ? zf : 100)); + + value = LocalStorage.getBool("pe-mobile-spellcheck", !(appOptions.customization && appOptions.customization.spellcheck===false)); + appSettings.changeSpellCheck(value); + this.api.asc_setSpellCheck(value); + + this.updateWindowTitle(true); + + this.api.SetTextBoxInputMode(LocalStorage.getBool("pe-settings-inputmode")); + + if (appOptions.isEdit && this.needToUpdateVersion) { + Common.Notifications.trigger('api:disconnect'); + } + + Common.Gateway.on('processsaveresult', this.onProcessSaveResult.bind(this)); + Common.Gateway.on('processrightschange', this.onProcessRightsChange.bind(this)); + Common.Gateway.on('downloadas', this.onDownloadAs.bind(this)); + Common.Gateway.on('requestclose', this.onRequestClose.bind(this)); + + Common.Gateway.sendInfo({ + mode: appOptions.isEdit ? 'edit' : 'view' + }); + this.api.Resize(); this.api.zoomFitToPage(); - // me.api.asc_GetDefaultTableStyles && _.defer(function () {me.api.asc_GetDefaultTableStyles()}); + this.api.asc_GetDefaultTableStyles && setTimeout(() => {this.api.asc_GetDefaultTableStyles()}, 1); this.applyLicense(); @@ -281,23 +427,354 @@ class MainController extends Component { Common.Notifications.trigger('document:ready'); } - _onOpenDocumentProgress(progress) { - // if (this.loadMask) { - // var $title = $$(this.loadMask).find('.modal-title'), - // const proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount()); - - // $title.text(this.textLoadingDocument + ': ' + Math.min(Math.round(proc * 100), 100) + '%'); - // } + onLicenseChanged (params) { + const appOptions = this.props.storeAppOptions; + const licType = params.asc_getLicenseType(); + if (licType !== undefined && appOptions.canEdit && appOptions.config.mode !== 'view' && + (licType === Asc.c_oLicenseResult.Connections || licType === Asc.c_oLicenseResult.UsersCount || licType === Asc.c_oLicenseResult.ConnectionsOS || licType === Asc.c_oLicenseResult.UsersCountOS + || licType === Asc.c_oLicenseResult.SuccessLimit && (appOptions.trialMode & Asc.c_oLicenseMode.Limited) !== 0)) + this._state.licenseType = licType; + if (this._isDocReady && this._state.licenseType) + this.applyLicense(); } - applyLicense() { - /* TO DO */ - Common.Notifications.trigger('toolbar:activatecontrols'); + applyLicense () { + const _t = this._t; + const warnNoLicense = _t.warnNoLicense.replace(/%1/g, __COMPANY_NAME__); + const warnNoLicenseUsers = _t.warnNoLicenseUsers.replace(/%1/g, __COMPANY_NAME__); + const textNoLicenseTitle = _t.textNoLicenseTitle.replace(/%1/g, __COMPANY_NAME__); + const warnLicenseExceeded = _t.warnLicenseExceeded.replace(/%1/g, __COMPANY_NAME__); + const warnLicenseUsersExceeded = _t.warnLicenseUsersExceeded.replace(/%1/g, __COMPANY_NAME__); + + const appOptions = this.props.storeAppOptions; + if (appOptions.config.mode !== 'view' && !EditorUIController.isSupportEditFeature()) { + let value = LocalStorage.getItem("pe-opensource-warning"); + value = (value !== null) ? parseInt(value) : 0; + const now = (new Date).getTime(); + if (now - value > 86400000) { + LocalStorage.setItem("pe-opensource-warning", now); + f7.dialog.create({ + title: _t.notcriticalErrorTitle, + text : _t.errorOpensource, + buttons: [{text: 'OK'}] + }).open(); + } + Common.Notifications.trigger('toolbar:activatecontrols'); + return; + } + + if (this._state.licenseType) { + let license = this._state.licenseType; + let buttons = [{text: 'OK'}]; + if ((appOptions.trialMode & Asc.c_oLicenseMode.Limited) !== 0 && + (license === Asc.c_oLicenseResult.SuccessLimit || + license === Asc.c_oLicenseResult.ExpiredLimited || + appOptions.permissionsLicense === Asc.c_oLicenseResult.SuccessLimit) + ) { + license = (license === Asc.c_oLicenseResult.ExpiredLimited) ? _t.warnLicenseLimitedNoAccess : _t.warnLicenseLimitedRenewed; + } else if (license === Asc.c_oLicenseResult.Connections || license === Asc.c_oLicenseResult.UsersCount) { + license = (license===Asc.c_oLicenseResult.Connections) ? warnLicenseExceeded : warnLicenseUsersExceeded; + } else { + license = (license === Asc.c_oLicenseResult.ConnectionsOS) ? warnNoLicense : warnNoLicenseUsers; + buttons = [{ + text: _t.textBuyNow, + bold: true, + onClick: function() { + window.open(`${__PUBLISHER_URL__}`, "_blank"); + } + }, + { + text: _t.textContactUs, + onClick: function() { + window.open(`mailto:${__SALES_EMAIL__}`, "_blank"); + } + }]; + } + if (this._state.licenseType === Asc.c_oLicenseResult.SuccessLimit) { + Common.Notifications.trigger('toolbar:activatecontrols'); + } else { + Common.Notifications.trigger('toolbar:activatecontrols'); + Common.Notifications.trigger('toolbar:deactivateeditcontrols'); + Common.Notifications.trigger('api:disconnect'); + } + + let value = LocalStorage.getItem("pe-license-warning"); + value = (value !== null) ? parseInt(value) : 0; + const now = (new Date).getTime(); + + if (now - value > 86400000) { + LocalStorage.setItem("pe-license-warning", now); + f7.dialog.create({ + title: textNoLicenseTitle, + text : license, + buttons: buttons + }).open(); + } + } else { + if (!appOptions.isDesktopApp && !appOptions.canBrandingExt && + appOptions.config && appOptions.config.customization && (appOptions.config.customization.loaderName || appOptions.config.customization.loaderLogo)) { + f7.dialog.create({ + title: _t.textPaidFeature, + text : _t.textCustomLoader, + buttons: [{ + text: _t.textContactUs, + bold: true, + onClick: () => { + window.open(`mailto:${__SALES_EMAIL__}`, "_blank"); + } + }, + { text: _t.textClose }] + }).open(); + } + Common.Notifications.trigger('toolbar:activatecontrols'); + } } - render() { + onUpdateVersion (callback) { + const _t = this._t; + + this.needToUpdateVersion = true; + Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument); + + f7.dialog.alert( + _t.errorUpdateVersion, + _t.titleUpdateVersion, + () => { + Common.Gateway.updateVersion(); + if (callback) { + callback.call(this); + } + Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument); + }); + } + + onServerVersion (buildVersion) { + if (this.changeServerVersion) return true; + const _t = this._t; + + if (About.appVersion() !== buildVersion && !window.compareVersions) { + this.changeServerVersion = true; + f7.dialog.alert( + _t.errorServerVersion, + _t.titleServerVersion, + () => { + setTimeout(() => {Common.Gateway.updateVersion()}, 0); + }); + return true; + } + return false; + } + + onAdvancedOptions (type, advOptions) { + if ($$('.dlg-adv-options.modal-in').length > 0) return; + + const _t = this._t; + + if (type == Asc.c_oAscAdvancedOptionsID.DRM) { + Common.Notifications.trigger('preloader:close'); + Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument); + + const buttons = [{ + text: 'OK', + bold: true, + close: false, + onClick: () => { + const password = document.getElementById('modal-password').value; + this.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(password)); + + if (!this._isDocReady) { + Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument); + } + } + }]; + if (this.props.storeAppOptions.canRequestClose) + buttons.push({ + text: _t.closeButtonText, + onClick: () => { + Common.Gateway.requestClose(); + } + }); + + f7.dialog.create({ + title: _t.advDRMOptions, + text: (typeof advOptions === 'string' ? advOptions : _t.txtProtected), + content: + `
+ +
`, + buttons: buttons, + cssClass: 'dlg-adv-options' + }).open(); + } + } + + onDocumentName () { + this.updateWindowTitle(true); + } + + updateWindowTitle (force) { + const isModified = this.api.isDocumentModified(); + if (this._state.isDocModified !== isModified || force) { + const title = this.defaultTitleText; + + if (window.document.title !== title) { + window.document.title = title; + } + + this._isDocReady && (this._state.isDocModified !== isModified) && Common.Gateway.setDocumentModified(isModified); + this._state.isDocModified = isModified; + } + } + + onPrint () { + if (!this.props.storeAppOptions.canPrint) return; + + if (this.api) + this.api.asc_Print(); + Common.component.Analytics.trackEvent('Print'); + } + + onPrintUrl (url) { + if (this.iframePrint) { + this.iframePrint.parentNode.removeChild(this.iframePrint); + this.iframePrint = null; + } + + if (!this.iframePrint) { + this.iframePrint = document.createElement("iframe"); + this.iframePrint.id = "id-print-frame"; + this.iframePrint.style.display = 'none'; + this.iframePrint.style.visibility = "hidden"; + this.iframePrint.style.position = "fixed"; + this.iframePrint.style.right = "0"; + this.iframePrint.style.bottom = "0"; + document.body.appendChild(this.iframePrint); + this.iframePrint.onload = function() { + this.iframePrint.contentWindow.focus(); + this.iframePrint.contentWindow.print(); + this.iframePrint.contentWindow.blur(); + window.focus(); + }; + } + + if (url) { + this.iframePrint.src = url; + } + } + + onMeta (meta) { + this.updateWindowTitle(true); + Common.Gateway.metaChange(meta); + } + + onExternalMessage (msg) { + if (msg && msg.msg) { + msg.msg = (msg.msg).toString(); + f7.notification.create({ + //title: uiApp.params.modalTitle, + text: [msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)], + closeButton: true + }).open(); + + Common.component.Analytics.trackEvent('External Error'); + } + } + + onRunAutostartMacroses () { + const config = this.props.storeAppOptions.config; + const enable = !config.customization || (config.customization.macros !== false); + if (enable) { + const value = this.props.storeApplicationSettings.macrosMode; + if (value === 1) { + this.api.asc_runAutostartMacroses(); + } else if (value === 0) { + const _t = this._t; + f7.dialog.create({ + title: _t.notcriticalErrorTitle, + text: _t.textHasMacros, + content: `
+ + ${_t.textRemember} +
`, + buttons: [{ + text: _t.textYes, + onClick: () => { + const dontshow = $$('input[name="checkbox-show-macros"]').prop('checked'); + if (dontshow) { + this.props.storeApplicationSettings.changeMacrosSettings(1); + LocalStorage.setItem("pe-mobile-macros-mode", 1); + } + setTimeout(() => { + this.api.asc_runAutostartMacroses(); + }, 1); + }}, + { + text: _t.textNo, + onClick: () => { + const dontshow = $$('input[name="checkbox-show-macros"]').prop('checked'); + if (dontshow) { + this.props.storeApplicationSettings.changeMacrosSettings(2); + LocalStorage.setItem("pe-mobile-macros-mode", 2); + } + } + }] + }).open(); + } + } + } + + onProcessSaveResult (data) { + this.api.asc_OnSaveEnd(data.result); + + if (data && data.result === false) { + const _t = this._t; + f7.dialog.alert( + (!data.message) ? _t.errorProcessSaveResult : data.message, + _t.criticalErrorTitle + ); + } + } + + onProcessRightsChange (data) { + if (data && data.enabled === false) { + const appOptions = this.props.storeAppOptions; + const old_rights = appOptions.lostEditingRights; + appOptions.changeEditingRights(!old_rights); + this.api.asc_coAuthoringDisconnect(); + Common.Notifications.trigger('api:disconnect'); + + if (!old_rights) { + const _t = this._t; + f7.dialog.alert( + (!data.message) ? _t.warnProcessRightsChange : data.message, + _t.notcriticalErrorTitle, + () => { appOptions.changeEditingRights(false); } + ); + } + } + } + + onDownloadAs () { + if ( !this.props.storeAppOptions.canDownload) { + Common.Gateway.reportError(Asc.c_oAscError.ID.AccessDeny, this.errorAccessDeny); + return; + } + this._state.isFromGatewayDownloadAs = true; + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PPTX, true)); + } + + onRequestClose () { + Common.Gateway.requestClose(); + } + + render () { return ( + + {EditorUIController.getEditCommentControllers && EditorUIController.getEditCommentControllers()} @@ -306,7 +783,7 @@ class MainController extends Component { ) } - componentDidMount() { + componentDidMount () { this.initSdk(); } } diff --git a/apps/presentationeditor/mobile/src/controller/settings/ApplicationSettings.jsx b/apps/presentationeditor/mobile/src/controller/settings/ApplicationSettings.jsx index c976d1f66..bc72b63bb 100644 --- a/apps/presentationeditor/mobile/src/controller/settings/ApplicationSettings.jsx +++ b/apps/presentationeditor/mobile/src/controller/settings/ApplicationSettings.jsx @@ -1,5 +1,6 @@ import React, { Component } from "react"; import { ApplicationSettings } from "../../view/settings/ApplicationSettings"; +import { LocalStorage } from '../../../../../common/mobile/utils/LocalStorage'; class ApplicationSettingsController extends Component { constructor(props) { @@ -8,23 +9,19 @@ class ApplicationSettingsController extends Component { setUnitMeasurement(value) { const api = Common.EditorApi.get(); - value = (value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric(); + value = (value !== null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric(); Common.Utils.Metric.setCurrentMetric(value); - // Common.localStorage.setItem("pe-mobile-settings-unit", value); - api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter)); + LocalStorage.setItem("pe-mobile-settings-unit", value); + api.asc_SetDocumentUnits((value === Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value === Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter)); } switchSpellCheck(value) { - const api = Common.EditorApi.get(); - // let state = value === '1' ? true : false; - // Common.localStorage.setItem("pe-mobile-spellcheck", state ? 1 : 0); - // Common.Utils.InternalSettings.set("pe-mobile-spellcheck", state); - api.asc_setSpellCheck(value); + LocalStorage.setBool("pe-mobile-spellcheck", value); + Common.EditorApi.get().asc_setSpellCheck(value); } setMacrosSettings(value) { - Common.Utils.InternalSettings.set("pe-mobile-macros-mode", value); - // Common.localStorage.setItem("pe-mobile-macros-mode", value); + LocalStorage.setItem("pe-mobile-macros-mode", value); } diff --git a/apps/presentationeditor/mobile/src/page/app.jsx b/apps/presentationeditor/mobile/src/page/app.jsx index 8e4ceafe1..55d94d9b2 100644 --- a/apps/presentationeditor/mobile/src/page/app.jsx +++ b/apps/presentationeditor/mobile/src/page/app.jsx @@ -3,6 +3,8 @@ import React from 'react'; import {App,Panel,Views,View,Popup,Page,Navbar,Toolbar,NavRight,Link,Block,BlockTitle,List,ListItem,ListInput,ListButton,BlockFooter} from 'framework7-react'; import { f7ready } from 'framework7-react'; +import '../../../../common/Analytics.js'; + import '../../../../common/Gateway.js'; import '../../../../common/main/lib/util/utils.js'; From 7c72e8cb1b3e06ac72b0e7156d33b8a8d3206dc4 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Wed, 21 Apr 2021 16:32:30 +0300 Subject: [PATCH 16/23] [SSE mobile] Changes for code decomposition --- .../mobile/src/controller/Main.jsx | 52 ++----- .../mobile/src/store/focusObjects.js | 129 +----------------- 2 files changed, 12 insertions(+), 169 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx index 1e166bd36..afd6c2524 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx @@ -187,6 +187,8 @@ class MainController extends Component { // 'translate': translate }); + Common.EditorApi = {get: () => this.api}; + this.appOptions = {}; this.bindEvents(); @@ -202,7 +204,6 @@ class MainController extends Component { Common.Gateway.appReady(); Common.Notifications.trigger('engineCreated', this.api); - Common.EditorApi = {get: () => this.api}; }, error => { console.log('promise failed ' + error); }); @@ -227,58 +228,21 @@ class MainController extends Component { // me.api.asc_registerCallback('asc_onDocumentName', _.bind(me.onDocumentName, me)); me.api.asc_registerCallback('asc_onEndAction', me._onLongActionEnd.bind(me)); - const storeSpreadsheetSettings = this.props.storeSpreadsheetSettings; - const storeFocusObjects = this.props.storeFocusObjects; - const storeCellSettings = this.props.storeCellSettings; - const storeTextSettings = this.props.storeTextSettings; - const storeChartSettings = this.props.storeChartSettings; - const styleSize = storeCellSettings.styleSize; - - this.api.asc_registerCallback('asc_onSelectionChanged', cellInfo => { - console.log(cellInfo); - - storeFocusObjects.resetCellInfo(cellInfo); - storeCellSettings.initCellSettings(cellInfo); - storeTextSettings.initTextSettings(cellInfo); + EditorUIController.initThemeColors && EditorUIController.initThemeColors(); - let selectedObjects = Common.EditorApi.get().asc_getGraphicObjectProps(); + EditorUIController.initCellInfo && EditorUIController.initCellInfo(this.props); - if(selectedObjects.length) { - storeFocusObjects.resetFocusObjects(selectedObjects); + EditorUIController.initEditorStyles && EditorUIController.initEditorStyles(this.props.storeCellSettings); - // Chart Settings - - if (storeFocusObjects.chartObject) { - storeChartSettings.updateChartStyles(this.api.asc_getChartPreviews(storeFocusObjects.chartObject.get_ChartProperties().getType())); - } - } - }); + EditorUIController.initFonts && EditorUIController.initFonts(this.props); + const styleSize = this.props.storeCellSettings.styleSize; this.api.asc_setThumbnailStylesSizes(styleSize.width, styleSize.height); - this.api.asc_registerCallback('asc_onInitEditorFonts', (fonts, select) => { - storeCellSettings.initEditorFonts(fonts, select); - storeTextSettings.initEditorFonts(fonts, select); - }); - - this.api.asc_registerCallback('asc_onEditorSelectionChanged', fontObj => { - console.log(fontObj) - storeCellSettings.initFontInfo(fontObj); - storeTextSettings.initFontInfo(fontObj); - }); - - this.api.asc_registerCallback('asc_onInitEditorStyles', styles => { - storeCellSettings.initCellStyles(styles); - }); - - this.api.asc_registerCallback('asc_onSendThemeColors', (colors, standart_colors) => { - Common.Utils.ThemeColor.setColors(colors, standart_colors); - }); - // Spreadsheet Settings this.api.asc_registerCallback('asc_onSendThemeColorSchemes', schemes => { - storeSpreadsheetSettings.addSchemes(schemes); + this.props.storeSpreadsheetSettings.addSchemes(schemes); }); // Downloaded Advanced Options diff --git a/apps/spreadsheeteditor/mobile/src/store/focusObjects.js b/apps/spreadsheeteditor/mobile/src/store/focusObjects.js index a5d710292..936293cb0 100644 --- a/apps/spreadsheeteditor/mobile/src/store/focusObjects.js +++ b/apps/spreadsheeteditor/mobile/src/store/focusObjects.js @@ -61,140 +61,19 @@ export class storeFocusObjects { } get selections () { - const _selections = []; - - let isCell, isRow, isCol, isAll, isChart, isImage, isTextShape, isShape, isTextChart, - selType = this._cellInfo.asc_getSelectionType(), - isObjLocked = false; - - switch (selType) { - case Asc.c_oAscSelectionType.RangeCells: isCell = true; break; - case Asc.c_oAscSelectionType.RangeRow: isRow = true; break; - case Asc.c_oAscSelectionType.RangeCol: isCol = true; break; - case Asc.c_oAscSelectionType.RangeMax: isAll = true; break; - case Asc.c_oAscSelectionType.RangeImage: isImage = true; break; - case Asc.c_oAscSelectionType.RangeShape: isShape = true; break; - case Asc.c_oAscSelectionType.RangeChart: isChart = true; break; - case Asc.c_oAscSelectionType.RangeChartText:isTextChart = true; break; - case Asc.c_oAscSelectionType.RangeShapeText: isTextShape = true; break; - } - - if (isImage || isShape || isChart) { - isImage = isShape = isChart = false; - let has_chartprops = false; - let selectedObjects = Common.EditorApi.get().asc_getGraphicObjectProps(); - - for (let i = 0; i < selectedObjects.length; i++) { - if (selectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image) { - const elValue = selectedObjects[i].asc_getObjectValue(); - isObjLocked = isObjLocked || elValue.asc_getLocked(); - const shapeProps = elValue.asc_getShapeProperties(); - - if (shapeProps) { - if (shapeProps.asc_getFromChart()) { - isChart = true; - } else { - isShape = true; - - } - } else if (elValue.asc_getChartProperties()) { - isChart = true; - has_chartprops = true; - } else { - isImage = true; - } - } - } - } else if (isTextShape || isTextChart) { - const selectedObjects = Common.EditorApi.get().asc_getGraphicObjectProps(); - let isEquation = false; - - for (var i = 0; i < selectedObjects.length; i++) { - const elType = selectedObjects[i].asc_getObjectType(); - if (elType == Asc.c_oAscTypeSelectElement.Image) { - const value = selectedObjects[i].asc_getObjectValue(); - isObjLocked = isObjLocked || value.asc_getLocked(); - } else if (elType == Asc.c_oAscTypeSelectElement.Paragraph) { - } else if (elType == Asc.c_oAscTypeSelectElement.Math) { - isEquation = true; - } - } - } - if (isChart || isTextChart) { - _selections.push('chart'); - - if (isTextChart) { - _selections.push('text'); - } - } else if ((isShape || isTextShape) && !isImage) { - _selections.push('shape'); - - if (isTextShape) { - _selections.push('text'); - } - } else if (isImage) { - _selections.push('image'); - - if (isShape) { - _selections.push('shape'); - } - } else { - _selections.push('cell'); - - if (this._cellInfo.asc_getHyperlink()) { - _selections.push('hyperlink'); - } - } - return _selections; + return !!this.intf ? this.intf.getSelections() : null; } get shapeObject() { - const shapes = []; - for (let object of this._focusObjects) { - if (object.get_ObjectType() === Asc.c_oAscTypeSelectElement.Image) { - if (object.get_ObjectValue() && object.get_ObjectValue().get_ShapeProperties()) { - shapes.push(object); - } - } - } - if (shapes.length > 0) { - const object = shapes[shapes.length - 1]; // get top - return object.get_ObjectValue(); - } else { - return undefined; - } + return !!this.intf ? this.intf.getShapeObject() : null; } get imageObject() { - const images = []; - for (let object of this._focusObjects) { - if (object.get_ObjectType() === Asc.c_oAscTypeSelectElement.Image) { - images.push(object); - } - } - if (images.length > 0) { - const object = images[images.length - 1]; // get top - return object.get_ObjectValue(); - } else { - return undefined; - } + return !!this.intf ? this.intf.getImageObject() : null; } get chartObject() { - const charts = []; - for (let object of this._focusObjects) { - if (object.get_ObjectType() === Asc.c_oAscTypeSelectElement.Image) { - if (object.get_ObjectValue() && object.get_ObjectValue().get_ChartProperties()) { - charts.push(object); - } - } - } - if (charts.length > 0) { - const object = charts[charts.length - 1]; // get top - return object.get_ObjectValue(); - } else { - return undefined; - } + return !!this.intf ? this.intf.getChartObject() : null; } } \ No newline at end of file From 26523317e7a5a66e4b76b504f1f1edb9e64c4b05 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Wed, 21 Apr 2021 21:03:14 +0300 Subject: [PATCH 17/23] [PE mobile] Add translations --- apps/presentationeditor/mobile/locale/en.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index a4aaae940..44a1aa35b 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -138,6 +138,12 @@ "errorCopyCutPaste": "Copy, cut and paste actions using the context menu will be performed within the current file only.", "textDoNotShowAgain": "Don't show again" }, + "Toolbar": { + "dlgLeaveTitleText": "You leave the application", + "dlgLeaveMsgText": "You have unsaved changes in this document. Click \\'Stay on this Page\\' to await the autosave of the document. Click \\'Leave this Page\\' to discard all the unsaved changes.", + "leaveButtonText": "Leave this Page", + "stayButtonText": "Stay on this Page" + }, "View": { "Settings": { "textDone": "Done", From cfbb8ce795ef5af699597d6410909c3ae6f5e3f0 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Wed, 21 Apr 2021 21:04:52 +0300 Subject: [PATCH 18/23] [SSE mobile] Add toolbar, add logo --- apps/spreadsheeteditor/mobile/locale/en.json | 6 + .../mobile/src/controller/Main.jsx | 6 + .../mobile/src/controller/Toolbar.jsx | 207 ++++++++++++++++++ .../mobile/src/page/main.jsx | 37 ++-- .../mobile/src/store/appOptions.js | 2 - .../mobile/src/view/Toolbar.jsx | 33 +++ 6 files changed, 269 insertions(+), 22 deletions(-) create mode 100644 apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx create mode 100644 apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index e1b4b968c..773ef247b 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -29,6 +29,12 @@ "menuEdit": "Edit", "menuDelete": "Delete" }, + "Toolbar": { + "dlgLeaveTitleText": "You leave the application", + "dlgLeaveMsgText": "You have unsaved changes in this document. Click \\'Stay on this Page\\' to await the autosave of the document. Click \\'Leave this Page\\' to discard all the unsaved changes.", + "leaveButtonText": "Leave this Page", + "stayButtonText": "Stay on this Page" + }, "View" : { "Add" : { "textChart": "Chart", diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx index afd6c2524..2b34515cb 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx @@ -278,6 +278,8 @@ class MainController extends Component { me.api.asc_getWorksheetsCount(); me.api.asc_showWorksheet(me.api.asc_getActiveWorksheetIndex()); + this.applyLicense(); + Common.Gateway.documentReady(); f7.emit('resize'); } @@ -291,6 +293,10 @@ class MainController extends Component { // } } + applyLicense () { + Common.Notifications.trigger('toolbar:activatecontrols'); + } + render() { return ( diff --git a/apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx b/apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx new file mode 100644 index 000000000..16dd1b657 --- /dev/null +++ b/apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx @@ -0,0 +1,207 @@ +import React, { useEffect, useState } from 'react'; +import { inject } from 'mobx-react'; +import { f7 } from 'framework7-react'; +import { useTranslation } from 'react-i18next'; +import ToolbarView from "../view/Toolbar"; + +const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetInfo')(props => { + const {t} = useTranslation(); + const _t = t("Toolbar", { returnObjects: true }); + + const appOptions = props.storeAppOptions; + const isDisconnected = props.users.isDisconnected; + const displayCollaboration = props.users.hasEditUsers || appOptions.canViewComments; + const docTitle = props.storeSpreadsheetInfo.dataDoc ? props.storeSpreadsheetInfo.dataDoc.title : ''; + + useEffect(() => { + const onDocumentReady = () => { + const api = Common.EditorApi.get(); + api.asc_registerCallback('asc_onCanUndoChanged', onApiCanUndo); + api.asc_registerCallback('asc_onCanRedoChanged', onApiCanRedo); + api.asc_registerCallback('asc_onSelectionChanged', onApiSelectionChanged); + api.asc_registerCallback('asc_onWorkbookLocked', onApiSelectionChanged); + api.asc_registerCallback('asc_onWorksheetLocked', onApiSelectionChanged); + api.asc_registerCallback('asc_onActiveSheetChanged', onApiActiveSheetChanged); + api.asc_registerCallback('asc_onCoAuthoringDisconnect', onCoAuthoringDisconnect); + + Common.Notifications.on('api:disconnect', onCoAuthoringDisconnect); + Common.Notifications.on('toolbar:activatecontrols', activateControls); + Common.Notifications.on('toolbar:deactivateeditcontrols', deactivateEditControls); + Common.Notifications.on('goback', goBack); + Common.Notifications.on('sheet:active', onApiActiveSheetChanged); + }; + if ( !Common.EditorApi ) { + Common.Notifications.on('document:ready', onDocumentReady); + Common.Gateway.on('init', loadConfig); + } else { + onDocumentReady(); + } + + return () => { + Common.Notifications.off('document:ready', onDocumentReady); + Common.Notifications.off('api:disconnect', onCoAuthoringDisconnect); + Common.Notifications.off('toolbar:activatecontrols', activateControls); + Common.Notifications.off('toolbar:deactivateeditcontrols', deactivateEditControls); + Common.Notifications.off('goback', goBack); + Common.Notifications.off('sheet:active', onApiActiveSheetChanged); + + const api = Common.EditorApi.get(); + api.asc_unregisterCallback('asc_onCanUndoChanged', onApiCanUndo); + api.asc_unregisterCallback('asc_onCanRedoChanged', onApiCanRedo); + //api.asc_unregisterCallback('asc_onSelectionChanged', onApiSelectionChanged); TO DO + api.asc_unregisterCallback('asc_onWorkbookLocked', onApiSelectionChanged); + api.asc_unregisterCallback('asc_onWorksheetLocked', onApiSelectionChanged); + api.asc_unregisterCallback('asc_onActiveSheetChanged', onApiActiveSheetChanged); + api.asc_unregisterCallback('asc_onCoAuthoringDisconnect', onCoAuthoringDisconnect); + } + }); + + // Back button + const [isShowBack, setShowBack] = useState(false); + const loadConfig = (data) => { + if (data && data.config && data.config.canBackToFolder !== false && + data.config.customization && data.config.customization.goback && + (data.config.customization.goback.url || data.config.customization.goback.requestClose && data.config.canRequestClose)) { + setShowBack(true); + } + }; + const onBack = () => { + const api = Common.EditorApi.get(); + if (api.asc_isDocumentModified()) { + f7.dialog.create({ + title : _t.dlgLeaveTitleText, + text : _t.dlgLeaveMsgText, + verticalButtons: true, + buttons : [ + { + text: _t.leaveButtonText, + onClick: function() { + goBack(); + } + }, + { + text: _t.stayButtonText, + bold: true + } + ] + }).open(); + } else { + goBack(); + } + }; + const goBack = (current) => { + //if ( !Common.Controllers.Desktop.process('goback') ) { + if (appOptions.customization.goback.requestClose && appOptions.canRequestClose) { + Common.Gateway.requestClose(); + } else { + const href = appOptions.customization.goback.url; + if (!current && appOptions.customization.goback.blank !== false) { + window.open(href, "_blank"); + } else { + parent.location.href = href; + } + } + //} + } + + // Undo and Redo + const [isCanUndo, setCanUndo] = useState(false); + const [isCanRedo, setCanRedo] = useState(false); + const onApiCanUndo = (can) => { + if (isDisconnected) return; + setCanUndo(can); + }; + const onApiCanRedo = (can) => { + if (isDisconnected) return; + setCanRedo(can); + }; + const onUndo = () => { + const api = Common.EditorApi.get(); + if (api) { + api.asc_Undo(); + } + }; + const onRedo = () => { + const api = Common.EditorApi.get(); + if (api) { + api.asc_Redo(); + } + } + + const [disabledEditControls, setDisabledEditControls] = useState(false); + const onApiSelectionChanged = (cellInfo) => { + if (isDisconnected) return; + + const api = Common.EditorApi.get(); + const info = !!cellInfo ? cellInfo : api.asc_getCellInfo(); + let islocked = false; + + switch (info.asc_getSelectionType()) { + case Asc.c_oAscSelectionType.RangeChart: + case Asc.c_oAscSelectionType.RangeImage: + case Asc.c_oAscSelectionType.RangeShape: + case Asc.c_oAscSelectionType.RangeChartText: + case Asc.c_oAscSelectionType.RangeShapeText: + const objects = api.asc_getGraphicObjectProps(); + for ( let i in objects ) { + if ( objects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image ) { + if ((islocked = objects[i].asc_getObjectValue().asc_getLocked())) + break; + } + } + break; + default: + islocked = info.asc_getLocked(); + } + + setDisabledEditControls(islocked); + }; + + const onApiActiveSheetChanged = (index) => { + Common.Notifications.trigger('comments:filterchange', ['doc', 'sheet' + Common.EditorApi.get().asc_getWorksheetId(index)], false ); + }; + + const [disabledSettings, setDisabledSettings] = useState(false); + const deactivateEditControls = (enableDownload) => { + setDisabledEditControls(true); + if (enableDownload) { + //DE.getController('Settings').setMode({isDisconnected: true, enableDownload: enableDownload}); + } else { + setDisabledSettings(true); + } + }; + + + const [disabledControls, setDisabledControls] = useState(true); + const activateControls = () => { + setDisabledControls(false); + }; + + const onCoAuthoringDisconnect = (enableDownload) => { + deactivateEditControls(enableDownload); + setCanUndo(false); + setCanRedo(false); + f7.popover.close(); + f7.sheet.close(); + f7.popup.close(); + }; + + return ( + + ) +}); + +export {ToolbarController as Toolbar}; \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/src/page/main.jsx b/apps/spreadsheeteditor/mobile/src/page/main.jsx index 2f7b3713d..e02028e24 100644 --- a/apps/spreadsheeteditor/mobile/src/page/main.jsx +++ b/apps/spreadsheeteditor/mobile/src/page/main.jsx @@ -1,21 +1,21 @@ import React, { Component } from 'react'; -import { Page, View, Navbar, NavLeft, NavRight, Link, Icon } from 'framework7-react'; +import { Page, View, Navbar, Subnavbar, Icon } from 'framework7-react'; +import { observer, inject } from "mobx-react"; -// import EditOptions from '../view/edit/Edit'; import Settings from '../view/settings/Settings'; import CollaborationView from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx' import CellEditor from '../controller/CellEditor'; import Statusbar from '../controller/StatusBar' import AddOptions from "../view/add/Add"; import EditOptions from "../view/edit/Edit"; -import { Device } from '../../../../common/mobile/utils/device'; import { Search, SearchSettings } from '../controller/Search'; import { f7 } from 'framework7-react'; import {FunctionGroups} from "../controller/add/AddFunction"; import ContextMenu from '../controller/ContextMenu'; +import { Toolbar } from "../controller/Toolbar"; -export default class MainPage extends Component { +class MainPage extends Component { constructor(props) { super(props); this.state = { @@ -61,23 +61,18 @@ export default class MainPage extends Component { }; render() { + const appOptions = this.props.storeAppOptions; + const config = appOptions.config; + const showLogo = !(appOptions.canBrandingExt && (config.customization && (config.customization.loaderName || config.customization.loaderLogo))); return ( - + {/* Top Navbar */} - - {/*
*/} - - - - - - this.handleClickToOpenOptions('edit')}> - this.handleClickToOpenOptions('add')}> - { Device.phone ? null : } - this.handleClickToOpenOptions('coauth')}> - this.handleClickToOpenOptions('settings')}> - - + + {showLogo &&
} + + + + this.handleClickToOpenOptions('add', {panels: panels, button: button})}/> {/* Page content */} @@ -106,4 +101,6 @@ export default class MainPage extends Component { ) } -}; \ No newline at end of file +} + +export default inject("storeAppOptions")(observer(MainPage)); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/src/store/appOptions.js b/apps/spreadsheeteditor/mobile/src/store/appOptions.js index bb3f69a2d..75900a131 100644 --- a/apps/spreadsheeteditor/mobile/src/store/appOptions.js +++ b/apps/spreadsheeteditor/mobile/src/store/appOptions.js @@ -12,8 +12,6 @@ export class storeAppOptions { isEdit = false; config = {}; - - isEdit = false; canViewComments = false; setConfigOptions (config) { diff --git a/apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx b/apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx new file mode 100644 index 000000000..26887d95b --- /dev/null +++ b/apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx @@ -0,0 +1,33 @@ +import React, {Fragment} from 'react'; +import {NavLeft, NavRight, NavTitle, Link, Icon} from 'framework7-react'; +import { Device } from '../../../../common/mobile/utils/device'; +import EditorUIController from '../lib/patch' + +const ToolbarView = props => { + return ( + + + {props.isShowBack && } + {props.isEdit && EditorUIController.toolbarOptions && EditorUIController.toolbarOptions.getUndoRedo({ + disabledUndo: !props.isCanUndo, + disabledRedo: !props.isCanRedo, + onUndoClick: props.onUndo, + onRedoClick: props.onRedo + })} + + {!Device.phone && {props.docTitle}} + + {props.isEdit && EditorUIController.toolbarOptions && EditorUIController.toolbarOptions.getEditOptions({ + disabled: props.disabledEditControls || props.disabledControls, + onEditClick: () => props.openOptions('edit'), + onAddClick: () => props.openOptions('add') + })} + { Device.phone ? null : } + {props.displayCollaboration && props.openOptions('coauth')}>} + props.openOptions('settings')}> + + + ) +}; + +export default ToolbarView; \ No newline at end of file From 588a7f03863ebf9ec3251a36decc8b4e280dda59 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 22 Apr 2021 13:54:26 +0300 Subject: [PATCH 19/23] [SSE mobile] Moved edit functions of context menu to private branch --- .../mobile/src/controller/ContextMenu.jsx | 243 ++++-------------- 1 file changed, 45 insertions(+), 198 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx b/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx index 39dad5fe2..7965086fb 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx @@ -7,6 +7,7 @@ import { LocalStorage } from '../../../../common/mobile/utils/LocalStorage'; import ContextMenuController from '../../../../common/mobile/lib/controller/ContextMenu'; import { idContextMenuElement } from '../../../../common/mobile/lib/view/ContextMenu'; import { Device } from '../../../../common/mobile/utils/device'; +import EditorUIController from '../lib/patch'; @inject ( stores => ({ isEdit: stores.storeAppOptions.isEdit, @@ -61,11 +62,14 @@ class ContextMenu extends ContextMenuController { super.onMenuItemClick(action); + if ( EditorUIController.ContextMenu && EditorUIController.ContextMenu.handleMenuItemClick(this, action) ) + return; + const api = Common.EditorApi.get(); const info = api.asc_getCellInfo(); switch (action) { case 'cut': - if (!api.asc_Cut() && !LocalStorage.getBool("sse-hide-copy-cut-paste-warning")) { + if (!LocalStorage.getBool("sse-hide-copy-cut-paste-warning")) { this.showCopyCutPasteModal(); } break; @@ -75,55 +79,13 @@ class ContextMenu extends ContextMenuController { } break; case 'paste': - if (!api.asc_Paste() && !LocalStorage.getBool("sse-hide-copy-cut-paste-warning")) { + if (!LocalStorage.getBool("sse-hide-copy-cut-paste-warning")) { this.showCopyCutPasteModal(); } break; - case 'addcomment': - Common.Notifications.trigger('addcomment'); - break; case 'viewcomment': Common.Notifications.trigger('viewcomment'); break; - case 'del': - api.asc_emptyCells(Asc.c_oAscCleanOptions.All); - break; - case 'wrap': - api.asc_setCellTextWrap(true); - break; - case 'unwrap': - api.asc_setCellTextWrap(false); - break; - case 'edit': - setTimeout(() => { - this.props.openOptions('edit'); - }, 0); - break; - case 'merge': - if (api.asc_mergeCellsDataLost(Asc.c_oAscMergeOptions.Merge)) { - setTimeout(() => { - f7.dialog.confirm(_t.warnMergeLostData, _t.notcriticalErrorTitle, () => { - api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge); - }); - }, 0); - } else { - api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge); - } - break; - case 'unmerge': - api.asc_mergeCells(Asc.c_oAscMergeOptions.None); - break; - case 'hide': - api[info.asc_getSelectionType() == Asc.c_oAscSelectionType.RangeRow ? 'asc_hideRows' : 'asc_hideColumns'](); - break; - case 'show': - api[info.asc_getSelectionType() == Asc.c_oAscSelectionType.RangeRow ? 'asc_showRows' : 'asc_showColumns'](); - break; - case 'addlink': - setTimeout(() => { - this.props.openOptions('add', 'link'); - }, 400) - break; case 'openlink': const linkinfo = info.asc_getHyperlink(); if ( linkinfo.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink ) { @@ -145,12 +107,22 @@ class ContextMenu extends ContextMenuController { api.asc_getUrlType(url) > 0 && this.openLink(url); } break; - case 'freezePanes': - api.asc_freezePane(); - break; } + } - console.log("click context menu item: " + action); + onMergeCells() { + const { t } = this.props; + const _t = t("ContextMenu", { returnObjects: true }); + const api = Common.EditorApi.get(); + if (api.asc_mergeCellsDataLost(Asc.c_oAscMergeOptions.Merge)) { + setTimeout(() => { + f7.dialog.confirm(_t.warnMergeLostData, _t.notcriticalErrorTitle, () => { + api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge); + }); + }, 0); + } else { + api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge); + } } showCopyCutPasteModal() { @@ -198,33 +170,35 @@ class ContextMenu extends ContextMenuController { const { t } = this.props; const _t = t("ContextMenu", { returnObjects: true }); - const { isEdit, canViewComments, isDisconnected } = this.props; + const { isEdit } = this.props; - const api = Common.EditorApi.get(); - const cellinfo = api.asc_getCellInfo(); + if (isEdit && EditorUIController.ContextMenu) { + return EditorUIController.ContextMenu.mapMenuItems(this); + } else { + const {canViewComments } = this.props; - const itemsIcon = []; - const itemsText = []; + const api = Common.EditorApi.get(); + const cellinfo = api.asc_getCellInfo(); - let iscellmenu, isrowmenu, iscolmenu, isallmenu, ischartmenu, isimagemenu, istextshapemenu, isshapemenu, istextchartmenu; - let iscelllocked = cellinfo.asc_getLocked(); - const seltype = cellinfo.asc_getSelectionType(); - const xfs = cellinfo.asc_getXfs(); - const isComments = cellinfo.asc_getComments().length > 0; //prohibit adding multiple comments in one cell; + const itemsIcon = []; + const itemsText = []; - switch (seltype) { - case Asc.c_oAscSelectionType.RangeCells: iscellmenu = true; break; - case Asc.c_oAscSelectionType.RangeRow: isrowmenu = true; break; - case Asc.c_oAscSelectionType.RangeCol: iscolmenu = true; break; - case Asc.c_oAscSelectionType.RangeMax: isallmenu = true; break; - case Asc.c_oAscSelectionType.RangeImage: isimagemenu = true; break; - case Asc.c_oAscSelectionType.RangeShape: isshapemenu = true; break; - case Asc.c_oAscSelectionType.RangeChart: ischartmenu = true; break; - case Asc.c_oAscSelectionType.RangeChartText: istextchartmenu = true; break; - case Asc.c_oAscSelectionType.RangeShapeText: istextshapemenu = true; break; - } + let iscellmenu, isrowmenu, iscolmenu, isallmenu, ischartmenu, isimagemenu, istextshapemenu, isshapemenu, istextchartmenu; + const seltype = cellinfo.asc_getSelectionType(); + const isComments = cellinfo.asc_getComments().length > 0; //prohibit adding multiple comments in one cell; + + switch (seltype) { + case Asc.c_oAscSelectionType.RangeCells: iscellmenu = true; break; + case Asc.c_oAscSelectionType.RangeRow: isrowmenu = true; break; + case Asc.c_oAscSelectionType.RangeCol: iscolmenu = true; break; + case Asc.c_oAscSelectionType.RangeMax: isallmenu = true; break; + case Asc.c_oAscSelectionType.RangeImage: isimagemenu = true; break; + case Asc.c_oAscSelectionType.RangeShape: isshapemenu = true; break; + case Asc.c_oAscSelectionType.RangeChart: ischartmenu = true; break; + case Asc.c_oAscSelectionType.RangeChartText: istextchartmenu = true; break; + case Asc.c_oAscSelectionType.RangeShapeText: istextshapemenu = true; break; + } - if (!isEdit) { if (iscellmenu || istextchartmenu || istextshapemenu) { itemsIcon.push({ event: 'copy', @@ -243,136 +217,9 @@ class ContextMenu extends ContextMenuController { event: 'viewcomment' }); } - } else { - if (!iscelllocked && (isimagemenu || isshapemenu || ischartmenu || istextshapemenu || istextchartmenu)) { - api.asc_getGraphicObjectProps().every((object) => { - if (object.asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image) { - iscelllocked = object.asc_getObjectValue().asc_getLocked(); - } - return !iscelllocked; - }); - } - - if (iscelllocked || api.isCellEdited) { - itemsIcon.push({ - event: 'copy', - icon: 'icon-copy' - }); - - } else { - itemsIcon.push({ - event: 'cut', - icon: 'icon-cut' - }); - itemsIcon.push({ - event: 'copy', - icon: 'icon-copy' - }); - itemsIcon.push({ - event: 'paste', - icon: 'icon-paste' - }); - itemsText.push({ - caption: _t.menuDelete, - event: 'del' - }); - - if (isimagemenu || isshapemenu || ischartmenu || - istextshapemenu || istextchartmenu) { - itemsText.push({ - caption: _t.menuEdit, - event: 'edit' - }); - } else { - if (iscolmenu || isrowmenu) { - itemsText.push({ - caption: _t.menuHide, - event: 'hide' - }); - itemsText.push({ - caption: _t.menuShow, - event: 'show' - }); - } else if (iscellmenu) { - if (!iscelllocked) { - itemsText.push({ - caption: _t.menuCell, - event: 'edit' - }); - } - - if (cellinfo.asc_getMerge() == Asc.c_oAscMergeOptions.None) { - itemsText.push({ - caption: _t.menuMerge, - event: 'merge' - }); - } - - if (cellinfo.asc_getMerge() == Asc.c_oAscMergeOptions.Merge) { - itemsText.push({ - caption: _t.menuUnmerge, - event: 'unmerge' - }); - } - - itemsText.push( - xfs.asc_getWrapText() ? - { - caption: _t.menuUnwrap, - event: 'unwrap' - } : - { - caption: _t.menuWrap, - event: 'wrap' - }); - - if (cellinfo.asc_getHyperlink() && !cellinfo.asc_getMultiselect()) { - itemsText.push({ - caption: _t.menuOpenLink, - event: 'openlink' - }); - } else if (!cellinfo.asc_getHyperlink() && !cellinfo.asc_getMultiselect() && - !cellinfo.asc_getLockText() && !!cellinfo.asc_getText()) { - itemsText.push({ - caption: _t.menuAddLink, - event: 'addlink' - }); - } - } - - itemsText.push({ - caption: api.asc_getSheetViewSettings().asc_getIsFreezePane() ? _t.menuUnfreezePanes : _t.menuFreezePanes, - event: 'freezePanes' - }); - - } - - if (canViewComments) { - if (isComments) { - itemsText.push({ - caption: _t.menuViewComment, - event: 'viewcomment' - }); - } else if (iscellmenu) { - itemsText.push({ - caption: _t.menuAddComment, - event: 'addcomment' - }); - } - } - } + return itemsIcon.concat(itemsText); } - - - if ( Device.phone && itemsText.length > 2 ) { - this.extraItems = itemsText.splice(2,itemsText.length, { - caption: _t.menuMore, - event: 'showActionSheet' - }); - } - - return itemsIcon.concat(itemsText); } initExtraItems () { From d66852e54071a6fef3cfa09137fb96fb4400c336 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 22 Apr 2021 21:55:57 +0300 Subject: [PATCH 20/23] [DE PE mobile] Refactoring long actions controller --- .../mobile/src/controller/LongActions.jsx | 117 ++++++++--------- .../mobile/src/controller/LongActions.jsx | 121 ++++++++---------- 2 files changed, 106 insertions(+), 132 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/LongActions.jsx b/apps/documenteditor/mobile/src/controller/LongActions.jsx index 5365f7264..740351164 100644 --- a/apps/documenteditor/mobile/src/controller/LongActions.jsx +++ b/apps/documenteditor/mobile/src/controller/LongActions.jsx @@ -1,82 +1,75 @@ -import React, { Component } from 'react'; -import { inject } from 'mobx-react'; +import React, { useEffect } from 'react'; import { f7 } from 'framework7-react'; -import { withTranslation } from 'react-i18next'; +import { useTranslation } from 'react-i18next'; import IrregularStack from "../../../../common/mobile/utils/IrregularStack"; -class LongActions extends Component { - constructor(props) { - super(props); +const LongActionsController = () => { + const {t} = useTranslation(); + const _t = t("LongActions", { returnObjects: true }); - this.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;} - }); + 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;} + }); - this.onLongActionBegin = this.onLongActionBegin.bind(this); - this.onLongActionEnd = this.onLongActionEnd.bind(this); - this.onOpenDocument = this.onOpenDocument.bind(this); - this.closePreloader = this.closePreloader.bind(this); - } + let loadMask = null; - closePreloader() { - if (this.loadMask && this.loadMask.el) { - f7.dialog.close(this.loadMask.el); + const closePreloader = () => { + if (loadMask && loadMask.el) { + f7.dialog.close(loadMask.el); } } - componentDidMount() { + useEffect( () => { Common.Notifications.on('engineCreated', (api) => { - api.asc_registerCallback('asc_onStartAction', this.onLongActionBegin); - api.asc_registerCallback('asc_onEndAction', this.onLongActionEnd); - api.asc_registerCallback('asc_onOpenDocumentProgress', this.onOpenDocument); + api.asc_registerCallback('asc_onStartAction', onLongActionBegin); + api.asc_registerCallback('asc_onEndAction', onLongActionEnd); + api.asc_registerCallback('asc_onOpenDocumentProgress', onOpenDocument); }); - Common.Notifications.on('preloader:endAction', this.onLongActionEnd); - Common.Notifications.on('preloader:beginAction', this.onLongActionBegin); - Common.Notifications.on('preloader:close', this.closePreloader); - } + Common.Notifications.on('preloader:endAction', onLongActionEnd); + Common.Notifications.on('preloader:beginAction', onLongActionBegin); + Common.Notifications.on('preloader:close', closePreloader); - componentWillUnmount() { - const api = Common.EditorApi.get(); - api.asc_unregisterCallback('asc_onStartAction', this.onLongActionBegin); - api.asc_unregisterCallback('asc_onEndAction', this.onLongActionEnd); - api.asc_unregisterCallback('asc_onOpenDocumentProgress', this.onOpenDocument); + return ( () => { + const api = Common.EditorApi.get(); + api.asc_unregisterCallback('asc_onStartAction', onLongActionBegin); + api.asc_unregisterCallback('asc_onEndAction', onLongActionEnd); + api.asc_unregisterCallback('asc_onOpenDocumentProgress', onOpenDocument); - Common.Notifications.off('preloader:endAction', this.onLongActionEnd); - Common.Notifications.off('preloader:beginAction', this.onLongActionBegin); - Common.Notifications.off('preloader:close', this.closePreloader); - } + Common.Notifications.off('preloader:endAction', onLongActionEnd); + Common.Notifications.off('preloader:beginAction', onLongActionBegin); + Common.Notifications.off('preloader:close', closePreloader); + }) + }); - onLongActionBegin (type, id) { + const onLongActionBegin = (type, id) => { const action = {id: id, type: type}; - this.stackLongActions.push(action); - this.setLongActionView(action); - } + stackLongActions.push(action); + setLongActionView(action); + }; - onLongActionEnd (type, id) { + const onLongActionEnd = (type, id) => { let action = {id: id, type: type}; - this.stackLongActions.pop(action); + stackLongActions.pop(action); //this.updateWindowTitle(true); - action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information}); + action = stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information}); if (action) { - this.setLongActionView(action) + setLongActionView(action) } - action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction}); + action = stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction}); if (action) { - this.setLongActionView(action) + setLongActionView(action) } else { - this.loadMask && this.loadMask.el && this.loadMask.el.classList.contains('modal-in') && f7.dialog.close(this.loadMask.el); + loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') && f7.dialog.close(loadMask.el); } - } + }; - setLongActionView (action) { - const { t } = this.props; - const _t = t("LongActions", { returnObjects: true }); + const setLongActionView = (action) => { let title = ''; let text = ''; switch (action.id) { @@ -177,31 +170,25 @@ class LongActions extends Component { return; } - if (this.loadMask && this.loadMask.el && this.loadMask.el.classList.contains('modal-in')) { - this.loadMask.el.getElementsByClassName('dialog-title')[0].innerHTML = title; + if (loadMask && loadMask.el && loadMask.el.classList.contains('modal-in')) { + loadMask.el.getElementsByClassName('dialog-title')[0].innerHTML = title; } else { - this.loadMask = f7.dialog.preloader(title); + loadMask = f7.dialog.preloader(title); } } - } + }; - onOpenDocument (progress) { - if (this.loadMask && this.loadMask.el) { - const $title = this.loadMask.el.getElementsByClassName('dialog-title')[0]; + const onOpenDocument = (progress) => { + if (loadMask && loadMask.el) { + const $title = loadMask.el.getElementsByClassName('dialog-title')[0]; const proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount()); - const { t } = this.props; - const _t = t("LongActions", { returnObjects: true }); $title.innerHTML = `${_t.textLoadingDocument}: ${Math.min(Math.round(proc * 100), 100)}%`; } } - render() { - return null; - } -} - -const LongActionsController = withTranslation()(LongActions); + return null; +}; export default LongActionsController; \ No newline at end of file diff --git a/apps/presentationeditor/mobile/src/controller/LongActions.jsx b/apps/presentationeditor/mobile/src/controller/LongActions.jsx index 0828925ab..4dbb515cf 100644 --- a/apps/presentationeditor/mobile/src/controller/LongActions.jsx +++ b/apps/presentationeditor/mobile/src/controller/LongActions.jsx @@ -1,82 +1,75 @@ -import React, { Component } from 'react'; -import { inject } from 'mobx-react'; +import React, { useEffect } from 'react'; import { f7 } from 'framework7-react'; -import { withTranslation } from 'react-i18next'; +import { useTranslation } from 'react-i18next'; import IrregularStack from "../../../../common/mobile/utils/IrregularStack"; -class LongActions extends Component { - constructor(props) { - super(props); +const LongActionsController = () => { + const {t} = useTranslation(); + const _t = t("LongActions", {returnObjects: true}); - this.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;} - }); + 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;} + }); - this.onLongActionBegin = this.onLongActionBegin.bind(this); - this.onLongActionEnd = this.onLongActionEnd.bind(this); - this.onOpenDocument = this.onOpenDocument.bind(this); - this.closePreloader = this.closePreloader.bind(this); - } + let loadMask = null; - closePreloader() { - if (this.loadMask && this.loadMask.el) { - f7.dialog.close(this.loadMask.el); + const closePreloader = () => { + if (loadMask && loadMask.el) { + f7.dialog.close(loadMask.el); } - } + }; - componentDidMount() { + useEffect( () => { Common.Notifications.on('engineCreated', (api) => { - api.asc_registerCallback('asc_onStartAction', this.onLongActionBegin); - api.asc_registerCallback('asc_onEndAction', this.onLongActionEnd); - api.asc_registerCallback('asc_onOpenDocumentProgress', this.onOpenDocument); + api.asc_registerCallback('asc_onStartAction', onLongActionBegin); + api.asc_registerCallback('asc_onEndAction', onLongActionEnd); + api.asc_registerCallback('asc_onOpenDocumentProgress', onOpenDocument); }); - Common.Notifications.on('preloader:endAction', this.onLongActionEnd); - Common.Notifications.on('preloader:beginAction', this.onLongActionBegin); - Common.Notifications.on('preloader:close', this.closePreloader); - } + Common.Notifications.on('preloader:endAction', onLongActionEnd); + Common.Notifications.on('preloader:beginAction', onLongActionBegin); + Common.Notifications.on('preloader:close', closePreloader); - componentWillUnmount() { - const api = Common.EditorApi.get(); - api.asc_unregisterCallback('asc_onStartAction', this.onLongActionBegin); - api.asc_unregisterCallback('asc_onEndAction', this.onLongActionEnd); - api.asc_unregisterCallback('asc_onOpenDocumentProgress', this.onOpenDocument); + return (() => { + const api = Common.EditorApi.get(); + api.asc_unregisterCallback('asc_onStartAction', onLongActionBegin); + api.asc_unregisterCallback('asc_onEndAction', onLongActionEnd); + api.asc_unregisterCallback('asc_onOpenDocumentProgress', onOpenDocument); - Common.Notifications.off('preloader:endAction', this.onLongActionEnd); - Common.Notifications.off('preloader:beginAction', this.onLongActionBegin); - Common.Notifications.off('preloader:close', this.closePreloader); - } + Common.Notifications.off('preloader:endAction', onLongActionEnd); + Common.Notifications.off('preloader:beginAction', onLongActionBegin); + Common.Notifications.off('preloader:close', closePreloader); + }) + }); - onLongActionBegin (type, id) { + const onLongActionBegin = (type, id) => { const action = {id: id, type: type}; - this.stackLongActions.push(action); - this.setLongActionView(action); - } + stackLongActions.push(action); + setLongActionView(action); + }; - onLongActionEnd (type, id) { + const onLongActionEnd = (type, id) => { let action = {id: id, type: type}; - this.stackLongActions.pop(action); + stackLongActions.pop(action); //this.updateWindowTitle(true); - action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information}); + action = stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information}); if (action) { - this.setLongActionView(action) + setLongActionView(action) } - action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction}); + action = stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction}); if (action) { - this.setLongActionView(action) + setLongActionView(action) } else { - this.loadMask && this.loadMask.el && this.loadMask.el.classList.contains('modal-in') && f7.dialog.close(this.loadMask.el); + loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') && f7.dialog.close(loadMask.el); } - } + }; - setLongActionView (action) { - const { t } = this.props; - const _t = t("LongActions", { returnObjects: true }); + const setLongActionView = (action) => { let title = ''; let text = ''; switch (action.id) { @@ -162,31 +155,25 @@ class LongActions extends Component { return; } - if (this.loadMask && this.loadMask.el && this.loadMask.el.classList.contains('modal-in')) { - this.loadMask.el.getElementsByClassName('dialog-title')[0].innerHTML = title; + if (loadMask && loadMask.el && loadMask.el.classList.contains('modal-in')) { + loadMask.el.getElementsByClassName('dialog-title')[0].innerHTML = title; } else { - this.loadMask = f7.dialog.preloader(title); + loadMask = f7.dialog.preloader(title); } } - } + }; - onOpenDocument (progress) { - if (this.loadMask && this.loadMask.el) { - const $title = this.loadMask.el.getElementsByClassName('dialog-title')[0]; + const onOpenDocument = (progress) => { + if (loadMask && loadMask.el) { + const $title = loadMask.el.getElementsByClassName('dialog-title')[0]; const proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount()); - const { t } = this.props; - const _t = t("LongActions", { returnObjects: true }); $title.innerHTML = `${_t.textLoadingDocument}: ${Math.min(Math.round(proc * 100), 100)}%`; } - } + }; - render() { - return null; - } -} - -const LongActionsController = withTranslation()(LongActions); + return null; +}; export default LongActionsController; \ No newline at end of file From 0d82918ed5b8ae62ec3065bac21bddb1016c1804 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 22 Apr 2021 21:57:08 +0300 Subject: [PATCH 21/23] [SSE mobile] Add error controller, add long actions controller --- apps/spreadsheeteditor/mobile/locale/en.json | 97 +++++ .../mobile/src/controller/Error.jsx | 355 ++++++++++++++++++ .../mobile/src/controller/LongActions.jsx | 190 ++++++++++ .../mobile/src/controller/Main.jsx | 6 + .../spreadsheeteditor/mobile/src/page/app.jsx | 5 +- 5 files changed, 652 insertions(+), 1 deletion(-) create mode 100644 apps/spreadsheeteditor/mobile/src/controller/Error.jsx create mode 100644 apps/spreadsheeteditor/mobile/src/controller/LongActions.jsx diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 773ef247b..9b308263c 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -6,6 +6,103 @@ "textAnonymous": "Anonymous" } }, + "LongActions": { + "openTitleText": "Opening Document", + "openTextText": "Opening document...", + "saveTitleText": "Saving Document", + "saveTextText": "Saving document...", + "loadFontsTitleText": "Loading Data", + "loadFontsTextText": "Loading data...", + "loadImagesTitleText": "Loading Images", + "loadImagesTextText": "Loading images...", + "loadFontTitleText": "Loading Data", + "loadFontTextText": "Loading data...", + "loadImageTitleText": "Loading Image", + "loadImageTextText": "Loading image...", + "downloadTitleText": "Downloading Document", + "downloadTextText": "Downloading document...", + "printTitleText": "Printing Document", + "printTextText": "Printing document...", + "uploadImageTitleText": "Uploading Image", + "uploadImageTextText": "Uploading image...", + "applyChangesTitleText": "Loading Data", + "applyChangesTextText": "Loading data...", + "savePreparingText": "Preparing to save", + "savePreparingTitle": "Preparing to save. Please wait...", + "waitText": "Please, wait...", + "txtEditingMode": "Set editing mode...", + "loadingDocumentTitleText": "Loading document", + "loadingDocumentTextText": "Loading document...", + "textLoadingDocument": "Loading document" + }, + "Error": { + "criticalErrorTitle": "Error", + "unknownErrorText": "Unknown error.", + "convertationTimeoutText": "Convertation timeout exceeded.", + "openErrorText": "An error has occurred while opening the file", + "saveErrorText": "An error has occurred while saving the file", + "downloadErrorText": "Download failed.", + "uploadImageSizeMessage": "Maximium image size limit exceeded.", + "uploadImageExtMessage": "Unknown image format.", + "uploadImageFileCountMessage": "No images uploaded.", + "errorKeyEncrypt": "Unknown key descriptor", + "errorKeyExpire": "Key descriptor expired", + "errorUsersExceed": "Count of users was exceed", + "errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download until the connection is restored and page is reloaded.", + "errorFilePassProtect": "The file is password protected and could not be opened.", + "errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:
opening price, max price, min price, closing price.", + "errorDataRange": "Incorrect data range.", + "errorDatabaseConnection": "External error.
Database connection error. Please, contact support.", + "errorUserDrop": "The file cannot be accessed right now.", + "errorConnectToServer": " The document could not be saved. Please check connection settings or contact your administrator.
When you click the 'OK' button, you will be prompted to download the document.", + "errorBadImageUrl": "Image url is incorrect", + "errorSessionAbsolute": "The document editing session has expired. Please reload the page.", + "errorSessionIdle": "The document has not been edited for quite a long time. Please reload the page.", + "errorSessionToken": "The connection to the server has been interrupted. Please reload the page.", + "errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", + "errorAccessDeny": "You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.", + "errorEditingDownloadas": "An error occurred during the work with the document.
Use the 'Download' option to save the file backup copy to your computer hard drive.", + "errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.", + "errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", + "errorDefaultMessage": "Error code: %1", + "criticalErrorExtText": "Press 'OK' to back to document list.", + "notcriticalErrorTitle": "Warning", + "scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", + "pastInMergeAreaError": "Cannot change part of a merged cell", + "errorWrongBracketsCount": "Found an error in the formula entered.
Wrong cout of brackets.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error or use the Esc button to cancel the formula editing.", + "errorCountArgExceed": "Found an error in the formula entered.
Count of arguments exceeded.", + "errorCountArg": "Found an error in the formula entered.
Invalid number of arguments.", + "errorFormulaName": "Found an error in the formula entered.
Incorrect formula name.", + "errorFormulaParsing": "Internal error while the formula parsing.", + "errorArgsRange": "Found an error in the formula entered.
Incorrect arguments range.", + "errorUnexpectedGuid": "External error.
Unexpected Guid. Please, contact support.", + "errorFileRequest": "External error.
File Request. Please, contact support.", + "errorFileVKey": "External error.
Incorrect securety key. Please, contact support.", + "errorMaxPoints": "The maximum number of points in series per chart is 4096.", + "errorOperandExpected": "The entered function syntax is not correct. Please check if you are missing one of the parentheses - '(' or ')'.", + "errorMoveRange": "Cann't change a part of merged cell", + "errorAutoFilterDataRange": "The operation could not be done for the selected range of cells.
Select a uniform data range inside or outside the table and try again.", + "errorAutoFilterChangeFormatTable": "The operation could not be done for the selected cells as you cannot move a part of the table.
Select another data range so that the whole table was shifted and try again.", + "errorAutoFilterChange": "The operation is not allowed, as it is attempting to shift cells in a table on your worksheet.", + "errorAutoFilterHiddenRange": "The operation cannot be performed because the area contains filtered cells.
Please unhide the filtered elements and try again.", + "errorFillRange": "Could not fill the selected range of cells.
All the merged cells need to be the same size.", + "errorInvalidRef": "Enter a correct name for the selection or a valid reference to go to.", + "errorCreateDefName": "The existing named ranges cannot be edited and the new ones cannot be created
at the moment as some of them are being edited.", + "errorPasteMaxRange": "The copy and paste area does not match. Please select an area with the same size or click the first cell in a row to paste the copied cells.", + "errorLockedAll": "The operation could not be done as the sheet has been locked by another user.", + "errorLockedWorksheetRename": "The sheet cannot be renamed at the moment as it is being renamed by another user", + "errorOpenWarning": "The length of one of the formulas in the file exceeded
the allowed number of characters and it was removed.", + "errorFrmlWrongReferences": "The function refers to a sheet that does not exist.
Please check the data and try again.", + "errorCopyMultiselectArea": "This command cannot be used with multiple selections.
Select a single range and try again.", + "errorPrintMaxPagesCount": "Unfortunately, it’s not possible to print more than 1500 pages at once in the current version of the program.
This restriction will be eliminated in upcoming releases.", + "errorChangeArray": "You cannot change part of an array.", + "errorMultiCellFormula": "Multi-cell array formulas are not allowed in tables.", + "errorFrmlMaxTextLength": "Text values in formulas are limited to 255 characters.
Use the CONCATENATE function or concatenation operator (&)", + "errorFrmlMaxLength": "You cannot add this formula as its length exceeded the allowed number of characters.
Please edit it and try again.", + "errorFrmlMaxReference": "You cannot enter this formula because it has too many values,
cell references, and/or names.", + "errorDataValidate":"The value you entered is not valid.
A user has restricted values that can be entered into this cell." + }, "ContextMenu": { "menuViewComment": "View Comment", "menuAddComment": "Add Comment", diff --git a/apps/spreadsheeteditor/mobile/src/controller/Error.jsx b/apps/spreadsheeteditor/mobile/src/controller/Error.jsx new file mode 100644 index 000000000..340da6739 --- /dev/null +++ b/apps/spreadsheeteditor/mobile/src/controller/Error.jsx @@ -0,0 +1,355 @@ +import React, { useEffect } from 'react'; +import { inject } from 'mobx-react'; +import { f7 } from 'framework7-react'; +import { useTranslation } from 'react-i18next'; + +const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocument}) => { + const {t} = useTranslation(); + const _t = t("Error", { returnObjects: true }); + + useEffect(() => { + Common.Notifications.on('engineCreated', (api) => { + api.asc_registerCallback('asc_onError', onError); + }); + return () => { + const api = Common.EditorApi.get(); + api.asc_unregisterCallback('asc_onError', onError); + } + }); + + const onError = (id, level, errData) => { + + if (id === Asc.c_oAscError.ID.LoadingScriptError) { + f7.notification.create({ + title: _t.criticalErrorTitle, + text: _t.scriptLoadError, + closeButton: true + }).open(); + return; + } + + Common.Notifications.trigger('preloader:close'); + Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + + const api = Common.EditorApi.get(); + + const config = { + closable: false + }; + + switch (id) + { + case Asc.c_oAscError.ID.Unknown: + config.msg = _t.unknownErrorText; + break; + + case Asc.c_oAscError.ID.ConvertationTimeout: + config.msg = _t.convertationTimeoutText; + break; + + case Asc.c_oAscError.ID.ConvertationOpenError: + config.msg = _t.openErrorText; + break; + + case Asc.c_oAscError.ID.ConvertationSaveError: + config.msg = _t.saveErrorText; + break; + + case Asc.c_oAscError.ID.DownloadError: + config.msg = _t.downloadErrorText; + break; + + case Asc.c_oAscError.ID.UplImageSize: + config.msg = _t.uploadImageSizeMessage; + break; + + case Asc.c_oAscError.ID.UplImageExt: + config.msg = _t.uploadImageExtMessage; + break; + + case Asc.c_oAscError.ID.UplImageFileCount: + config.msg = _t.uploadImageFileCountMessage; + break; + + case Asc.c_oAscError.ID.PastInMergeAreaError: + config.msg = _t.pastInMergeAreaError; + break; + + case Asc.c_oAscError.ID.FrmlWrongCountParentheses: + config.msg = _t.errorWrongBracketsCount; + config.closable = true; + break; + + case Asc.c_oAscError.ID.FrmlWrongOperator: + config.msg = _t.errorWrongOperator; + config.closable = true; + break; + + case Asc.c_oAscError.ID.FrmlWrongMaxArgument: + config.msg = _t.errorCountArgExceed; + config.closable = true; + break; + + case Asc.c_oAscError.ID.FrmlWrongCountArgument: + config.msg = _t.errorCountArg; + config.closable = true; + break; + + case Asc.c_oAscError.ID.FrmlWrongFunctionName: + config.msg = _t.errorFormulaName; + config.closable = true; + break; + + case Asc.c_oAscError.ID.FrmlAnotherParsingError: + config.msg = _t.errorFormulaParsing; + config.closable = true; + break; + + case Asc.c_oAscError.ID.FrmlWrongArgumentRange: + config.msg = _t.errorArgsRange; + config.closable = true; + break; + + case Asc.c_oAscError.ID.UnexpectedGuid: + config.msg = _t.errorUnexpectedGuid; + break; + + case Asc.c_oAscError.ID.FileRequest: + config.msg = _t.errorFileRequest; + break; + + case Asc.c_oAscError.ID.FileVKey: + config.msg = _t.errorFileVKey; + break; + + case Asc.c_oAscError.ID.MaxDataPointsError: + config.msg = _t.errorMaxPoints; + break; + + case Asc.c_oAscError.ID.FrmlOperandExpected: + config.msg = _t.errorOperandExpected; + config.closable = true; + break; + + case Asc.c_oAscError.ID.CannotMoveRange: + config.msg = _t.errorMoveRange; + break; + + case Asc.c_oAscError.ID.AutoFilterDataRangeError: + config.msg = _t.errorAutoFilterDataRange; + break; + + case Asc.c_oAscError.ID.AutoFilterChangeFormatTableError: + config.msg = _t.errorAutoFilterChangeFormatTable; + break; + + case Asc.c_oAscError.ID.AutoFilterChangeError: + config.msg = _t.errorAutoFilterChange; + break; + + case Asc.c_oAscError.ID.AutoFilterMoveToHiddenRangeError: + config.msg = _t.errorAutoFilterHiddenRange; + break; + + case Asc.c_oAscError.ID.CannotFillRange: + config.msg = _t.errorFillRange; + break; + + case Asc.c_oAscError.ID.InvalidReferenceOrName: + config.msg = _t.errorInvalidRef; + break; + + case Asc.c_oAscError.ID.LockCreateDefName: + config.msg = _t.errorCreateDefName; + break; + + case Asc.c_oAscError.ID.PasteMaxRangeError: + config.msg = _t.errorPasteMaxRange; + break; + + case Asc.c_oAscError.ID.LockedAllError: + config.msg = _t.errorLockedAll; + break; + + case Asc.c_oAscError.ID.LockedWorksheetRename: + config.msg = _t.errorLockedWorksheetRename; + break; + + case Asc.c_oAscError.ID.OpenWarning: + config.msg = _t.errorOpenWarning; + break; + + case Asc.c_oAscError.ID.FrmlWrongReferences: + config.msg = _t.errorFrmlWrongReferences; + config.closable = true; + break; + + case Asc.c_oAscError.ID.CopyMultiselectAreaError: + config.msg = _t.errorCopyMultiselectArea; + break; + + case Asc.c_oAscError.ID.PrintMaxPagesCount: + config.msg = _t.errorPrintMaxPagesCount; + break; + + case Asc.c_oAscError.ID.CannotChangeFormulaArray: + config.msg = _t.errorChangeArray; + break; + + case Asc.c_oAscError.ID.MultiCellsInTablesFormulaArray: + config.msg = _t.errorMultiCellFormula; + break; + + case Asc.c_oAscError.ID.FrmlMaxTextLength: + config.msg = _t.errorFrmlMaxTextLength; + break; + + case Asc.c_oAscError.ID.FrmlMaxLength: + config.msg = _t.errorFrmlMaxLength; + break; + + case Asc.c_oAscError.ID.FrmlMaxReference: + config.msg = _t.errorFrmlMaxReference; + break; + + case Asc.c_oAscError.ID.DataValidate: + errData && errData.asc_getErrorTitle() && (config.title = Common.Utils.String.htmlEncode(errData.asc_getErrorTitle())); + config.msg = errData && errData.asc_getError() ? Common.Utils.String.htmlEncode(errData.asc_getError()) : _t.errorDataValidate; + break; + + case Asc.c_oAscError.ID.VKeyEncrypt: + config.msg = _t.errorKeyEncrypt; + break; + + case Asc.c_oAscError.ID.KeyExpire: + config.msg = _t.errorKeyExpire; + break; + + case Asc.c_oAscError.ID.UserCountExceed: + config.msg = _t.errorUsersExceed; + break; + + case Asc.c_oAscError.ID.CoAuthoringDisconnect: + config.msg = _t.errorViewerDisconnect; + break; + + case Asc.c_oAscError.ID.ConvertationPassword: + config.msg = _t.errorFilePassProtect; + break; + + case Asc.c_oAscError.ID.StockChartError: + config.msg = _t.errorStockChart; + break; + + case Asc.c_oAscError.ID.DataRangeError: + config.msg = _t.errorDataRange; + break; + + case Asc.c_oAscError.ID.Database: + config.msg = _t.errorDatabaseConnection; + break; + + case Asc.c_oAscError.ID.UserDrop: + const lostEditingRights = storeAppOptions.lostEditingRights; + if (lostEditingRights) { + storeAppOptions.changeEditingRights(false); + return; + } + storeAppOptions.changeEditingRights(true); + config.msg = _t.errorUserDrop; + break; + + case Asc.c_oAscError.ID.Warning: + config.msg = _t.errorConnectToServer; + break; + + case Asc.c_oAscError.ID.UplImageUrl: + config.msg = _t.errorBadImageUrl; + break; + + case Asc.c_oAscError.ID.SessionAbsolute: + config.msg = _t.errorSessionAbsolute; + break; + + case Asc.c_oAscError.ID.SessionIdle: + config.msg = _t.errorSessionIdle; + break; + + case Asc.c_oAscError.ID.SessionToken: + config.msg = _t.errorSessionToken; + break; + + case Asc.c_oAscError.ID.DataEncrypted: + config.msg = _t.errorDataEncrypted; + break; + + case Asc.c_oAscError.ID.AccessDeny: + config.msg = _t.errorAccessDeny; + break; + + case Asc.c_oAscError.ID.EditingError: + config.msg = _t.errorEditingDownloadas; + break; + + case Asc.c_oAscError.ID.ConvertationOpenLimitError: + config.msg = _t.errorFileSizeExceed; + break; + + case Asc.c_oAscError.ID.UpdateVersion: + config.msg = _t.errorUpdateVersionOnDisconnect; + break; + + default: + config.msg = _t.errorDefaultMessage.replace('%1', id); + break; + } + + if (level === Asc.c_oAscError.Level.Critical) { + + // report only critical errors + Common.Gateway.reportError(id, config.msg); + + config.title = _t.criticalErrorTitle; + + if (storeAppOptions.canBackToFolder && !storeAppOptions.isDesktopApp) { + config.msg += '

' + _t.criticalErrorExtText; + config.callback = function() { + Common.Notifications.trigger('goback', true); + } + } + if (id === Asc.c_oAscError.ID.DataEncrypted) { + api.asc_coAuthoringDisconnect(); + Common.Notifications.trigger('api:disconnect'); + } + } + else { + Common.Gateway.reportWarning(id, config.msg); + + config.title = config.title || _t.notcriticalErrorTitle; + config.callback = (btn) => { + if (id == Asc.c_oAscError.ID.DataValidate) { + api.asc_closeCellEditor(true); + } + storeAppOptions.changeEditingRights(false); + }; + } + + f7.dialog.create({ + cssClass: 'error-dialog', + title : config.title, + text : config.msg, + buttons: [ + { + text: 'OK', + onClick: config.callback + } + ] + }).open(); + + Common.component.Analytics.trackEvent('Internal Error', id.toString()); + }; + + return null +}); + +export default ErrorController; \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/src/controller/LongActions.jsx b/apps/spreadsheeteditor/mobile/src/controller/LongActions.jsx new file mode 100644 index 000000000..0f2fb50f7 --- /dev/null +++ b/apps/spreadsheeteditor/mobile/src/controller/LongActions.jsx @@ -0,0 +1,190 @@ +import React, { useEffect } from 'react'; +import { f7 } from 'framework7-react'; +import { useTranslation } from 'react-i18next'; +import IrregularStack from "../../../../common/mobile/utils/IrregularStack"; + +const LongActionsController = () => { + const {t} = useTranslation(); + const _t = t("LongActions", { returnObjects: true }); + + 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;} + }); + + let loadMask = null; + + const closePreloader = () => { + if (loadMask && loadMask.el) { + f7.dialog.close(loadMask.el); + } + } + + useEffect( () => { + Common.Notifications.on('engineCreated', (api) => { + api.asc_registerCallback('asc_onStartAction', onLongActionBegin); + api.asc_registerCallback('asc_onEndAction', onLongActionEnd); + api.asc_registerCallback('asc_onOpenDocumentProgress', onOpenDocument); + }); + Common.Notifications.on('preloader:endAction', onLongActionEnd); + Common.Notifications.on('preloader:beginAction', onLongActionBegin); + Common.Notifications.on('preloader:close', closePreloader); + + return ( () => { + const api = Common.EditorApi.get(); + api.asc_unregisterCallback('asc_onStartAction', onLongActionBegin); + api.asc_unregisterCallback('asc_onEndAction', onLongActionEnd); + api.asc_unregisterCallback('asc_onOpenDocumentProgress', onOpenDocument); + + Common.Notifications.off('preloader:endAction', onLongActionEnd); + Common.Notifications.off('preloader:beginAction', onLongActionBegin); + Common.Notifications.off('preloader:close', closePreloader); + }) + }); + + const onLongActionBegin = (type, id) => { + const action = {id: id, type: type}; + stackLongActions.push(action); + setLongActionView(action); + }; + + const onLongActionEnd = (type, id) => { + let action = {id: id, type: type}; + stackLongActions.pop(action); + + //this.updateWindowTitle(true); + + action = stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information}); + + if (action) { + this.setLongActionView(action) + } + + action = stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction}); + + if (action) { + setLongActionView(action) + } else { + loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') && f7.dialog.close(loadMask.el); + } + }; + + const setLongActionView = (action) => { + let title = ''; + let text = ''; + switch (action.id) { + case Asc.c_oAscAsyncAction['Open']: + title = _t.openTitleText; + text = _t.openTextText; + break; + + case Asc.c_oAscAsyncAction['Save']: + title = _t.saveTitleText; + text = _t.saveTextText; + break; + + case Asc.c_oAscAsyncAction['LoadDocumentFonts']: + title = _t.loadFontsTitleText; + text = _t.loadFontsTextText; + break; + + case Asc.c_oAscAsyncAction['LoadDocumentImages']: + title = _t.loadImagesTitleText; + text = _t.loadImagesTextText; + break; + + case Asc.c_oAscAsyncAction['LoadFont']: + title = _t.loadFontTitleText; + text = _t.loadFontTextText; + break; + + case Asc.c_oAscAsyncAction['LoadImage']: + title = _t.loadImageTitleText; + text = _t.loadImageTextText; + break; + + case Asc.c_oAscAsyncAction['DownloadAs']: + title = _t.downloadTitleText; + text = _t.downloadTextText; + break; + + case Asc.c_oAscAsyncAction['Print']: + title = _t.printTitleText; + text = _t.printTextText; + break; + + case Asc.c_oAscAsyncAction['UploadImage']: + title = _t.uploadImageTitleText; + text = _t.uploadImageTextText; + break; + + case Asc.c_oAscAsyncAction['ApplyChanges']: + title = _t.applyChangesTitleText; + text = _t.applyChangesTextText; + break; + + case Asc.c_oAscAsyncAction['PrepareToSave']: + title = _t.savePreparingText; + text = _t.savePreparingTitle; + break; + + case Asc.c_oAscAsyncAction['MailMergeLoadFile']: + title = _t.mailMergeLoadFileText; + text = _t.mailMergeLoadFileTitle; + break; + + case Asc.c_oAscAsyncAction['DownloadMerge']: + title = _t.downloadMergeTitle; + text = _t.downloadMergeText; + break; + + case Asc.c_oAscAsyncAction['SendMailMerge']: + title = _t.sendMergeTitle; + text = _t.sendMergeText; + break; + + case Asc.c_oAscAsyncAction['Waiting']: + title = _t.waitText; + text = _t.waitText; + break; + + case ApplyEditRights: + title = _t.txtEditingMode; + text = _t.txtEditingMode; + break; + + case LoadingDocument: + title = _t.loadingDocumentTitleText; + text = _t.loadingDocumentTextText; + break; + default: + if (typeof action.id == 'string'){ + title = action.id; + text = action.id; + } + break; + } + + if (action.type == Asc.c_oAscAsyncActionType.BlockInteraction) { + if (loadMask && loadMask.el && loadMask.el.classList.contains('modal-in')) { + loadMask.el.getElementsByClassName('dialog-title')[0].innerHTML = title; + } else { + loadMask = f7.dialog.preloader(title); + } + } + + }; + + const onOpenDocument = (progress) => { + if (loadMask && loadMask.el) { + const $title = loadMask.el.getElementsByClassName('dialog-title')[0]; + const proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount()); + + $title.innerHTML = `${_t.textLoadingDocument}: ${Math.min(Math.round(proc * 100), 100)}%`; + } + } + + return null; +}; + +export default LongActionsController; \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx index 2b34515cb..c64810f94 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx @@ -12,12 +12,16 @@ import { EditCommentController, ViewCommentsController } from "../../../../common/mobile/lib/controller/collaboration/Comments"; +import LongActionsController from "./LongActions"; +import ErrorController from "./Error"; @inject("storeAppOptions", "storeFocusObjects", "storeCellSettings", "storeTextSettings", "storeChartSettings", "storeSpreadsheetSettings", "storeSpreadsheetInfo") class MainController extends Component { constructor(props) { super(props); window.editorType = 'sse'; + + this.LoadingDocument = -256; } initSdk() { @@ -300,6 +304,8 @@ class MainController extends Component { render() { return ( + + diff --git a/apps/spreadsheeteditor/mobile/src/page/app.jsx b/apps/spreadsheeteditor/mobile/src/page/app.jsx index b38f5c34a..2bf443815 100644 --- a/apps/spreadsheeteditor/mobile/src/page/app.jsx +++ b/apps/spreadsheeteditor/mobile/src/page/app.jsx @@ -1,10 +1,13 @@ -import '../../../../common/Gateway.js'; import React from 'react'; import {App,Views,View,Navbar,NavLeft,NavRight,Link} from 'framework7-react'; import { f7ready } from 'framework7-react'; +import '../../../../common/Analytics.js'; + +import '../../../../common/Gateway.js'; + import routes from '../router/routes.js'; import '../../../../common/main/lib/util/utils.js'; From 8fb9119f01c125fb3a94e3a822c9e678bef495ae Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Sat, 24 Apr 2021 17:57:44 +0300 Subject: [PATCH 22/23] [SSE mobile] Make main controller --- apps/spreadsheeteditor/mobile/locale/en.json | 58 +- .../mobile/src/controller/Main.jsx | 621 +++++++++++++++--- .../mobile/src/store/appOptions.js | 13 +- 3 files changed, 600 insertions(+), 92 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 9b308263c..f5f0994ac 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -2,8 +2,64 @@ "Controller" : { "Main" : { "SDK": { + "txtStyle_Normal": "Normal", + "txtStyle_Heading_1": "Heading 1", + "txtStyle_Heading_2": "Heading 2", + "txtStyle_Heading_3": "Heading 3", + "txtStyle_Heading_4": "Heading 4", + "txtStyle_Title": "Title", + "txtStyle_Neutral": "Neutral", + "txtStyle_Bad": "Bad", + "txtStyle_Good": "Good", + "txtStyle_Input": "Input", + "txtStyle_Output": "Output", + "txtStyle_Calculation": "Calculation", + "txtStyle_Check_Cell": "Check Cell", + "txtStyle_Explanatory_Text": "Explanatory Text", + "txtStyle_Note": "Note", + "txtStyle_Linked_Cell": "Linked Cell", + "txtStyle_Warning_Text": "Warning Text", + "txtStyle_Total": "Total", + "txtStyle_Currency": "Currency", + "txtStyle_Percent": "Percent", + "txtStyle_Comma": "Comma", + "txtSeries": "Series", + "txtDiagramTitle": "Chart Title", + "txtXAxis": "X Axis", + "txtYAxis": "Y Axis", + "txtArt": "Your text here", + "txtAccent": "Accent" }, - "textAnonymous": "Anonymous" + "textGuest": "Guest", + "textAnonymous": "Anonymous", + "warnLicenseExceeded": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact your administrator to learn more.", + "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.", + "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.", + "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", + "textNoLicenseTitle": "License limit reached", + "warnLicenseLimitedNoAccess": "License expired. You have no access to document editing functionality. Please contact your administrator.", + "warnLicenseLimitedRenewed": "License needs to be renewed. You have a limited access to document editing functionality.
Please contact your administrator to get full access", + "textBuyNow": "Visit website", + "textContactUs": "Contact sales", + "textPaidFeature": "Paid feature", + "textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader. Please contact our Sales Department to get a quote.", + "textClose": "Close", + + "notcriticalErrorTitle": "Warning", + "textHasMacros": "The file contains automatic macros.
Do you want to run macros?", + "textRemember": "Remember my choice", + "textYes": "Yes", + "textNo": "No", + + "leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", + "errorUpdateVersion": "The file version has been changed. The page will be reloaded.", + "titleUpdateVersion": "Version changed", + "errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.", + "titleServerVersion": "Editor updated", + "errorProcessSaveResult": "Saving is failed.", + "criticalErrorTitle": "Error", + "warnProcessRightsChange": "You have been denied the right to edit the file.", + "errorAccessDeny": "You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator." } }, "LongActions": { diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx index c64810f94..907461fa7 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx @@ -12,16 +12,38 @@ import { EditCommentController, ViewCommentsController } from "../../../../common/mobile/lib/controller/collaboration/Comments"; +import {LocalStorage} from "../../../../common/mobile/utils/LocalStorage"; import LongActionsController from "./LongActions"; import ErrorController from "./Error"; +import app from "../page/app"; +import About from "../../../../common/mobile/lib/view/About"; -@inject("storeAppOptions", "storeFocusObjects", "storeCellSettings", "storeTextSettings", "storeChartSettings", "storeSpreadsheetSettings", "storeSpreadsheetInfo") +@inject( + "storeAppOptions", + "storeFocusObjects", + "storeCellSettings", + "storeTextSettings", + "storeChartSettings", + "storeSpreadsheetSettings", + "storeSpreadsheetInfo", + "storeApplicationSettings" + ) class MainController extends Component { constructor(props) { super(props); window.editorType = 'sse'; this.LoadingDocument = -256; + + this._state = { + licenseType: false, + isDocModified: false + }; + + this.defaultTitleText = __APP_TITLE_TEXT__; + + const { t } = this.props; + this._t = t('Controller.Main', {returnObjects:true}); } initSdk() { @@ -56,46 +78,52 @@ class MainController extends Component { }; const loadConfig = data => { + const _t = this._t; + EditorUIController.isSupportEditFeature(); - let me = this; + this.editorConfig = Object.assign({}, this.editorConfig, data.config); + this.appOptions.lang = this.editorConfig.lang; - me.editorConfig = Object.assign({}, this.editorConfig, data.config); - me.appOptions.user = Common.Utils.fillUserInfo(me.editorConfig.user, me.editorConfig.lang, "Local.User"/*me.textAnonymous*/); -/**/ - me.editorConfig.user = - me.appOptions.user = Common.Utils.fillUserInfo(me.editorConfig.user, me.editorConfig.lang, me.textAnonymous); - me.appOptions.lang = me.editorConfig.lang; + const appOptions = this.props.storeAppOptions; + appOptions.setConfigOptions(this.editorConfig, _t); - this.props.storeAppOptions.setConfigOptions(this.editorConfig); + let value; + if (appOptions.canRenameAnonymous) { + value = LocalStorage.getItem("guest-username"); + //Common.Utils.InternalSettings.set("guest-username", value); + //Common.Utils.InternalSettings.set("save-guest-username", !!value); + } - // var value = Common.localStorage.getItem("sse-settings-regional"); - // if (value!==null) - // this.api.asc_setLocale(parseInt(value)); - // else { - // value = me.appOptions.region; - // value = Common.util.LanguageInfo.getLanguages().hasOwnProperty(value) ? value : Common.util.LanguageInfo.getLocalLanguageCode(value); - // if (value!==null) - // value = parseInt(value); - // else - // value = (this.editorConfig.lang) ? parseInt(Common.util.LanguageInfo.getLocalLanguageCode(me.editorConfig.lang)) : 0x0409; - // this.api.asc_setLocale(value); - // } + value = LocalStorage.getItem("sse-settings-regional"); + if (value !== null) { + this.api.asc_setLocale(parseInt(value)); + } else { + value = appOptions.region; + value = Common.util.LanguageInfo.getLanguages().hasOwnProperty(value) ? value : Common.util.LanguageInfo.getLocalLanguageCode(value); + if (value !== null) { + value = parseInt(value); + } else { + value = (appOptions.lang) ? parseInt(Common.util.LanguageInfo.getLocalLanguageCode(appOptions.lang)) : 0x0409; + } + this.api.asc_setLocale(value); + } - // if (me.appOptions.location == 'us' || me.appOptions.location == 'ca') - // Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch); - // - // if (!me.editorConfig.customization || !(me.editorConfig.customization.loaderName || me.editorConfig.customization.loaderLogo)) - // $('#editor_sdk').append('
' + '
'.repeat(2) + '
'); - // - // var value = Common.localStorage.getItem("sse-mobile-macros-mode"); - // if (value === null) { - // value = this.editorConfig.customization ? this.editorConfig.customization.macrosMode : 'warn'; - // value = (value == 'enable') ? 1 : (value == 'disable' ? 2 : 0); - // } else - // value = parseInt(value); - // Common.Utils.InternalSettings.set("sse-mobile-macros-mode", value); + if (appOptions.location == 'us' || appOptions.location == 'ca') { + Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch); + } + //if (!appOptions.customization || !(appOptions.customization.loaderName || appOptions.customization.loaderLogo)) + //$('#editor_sdk').append('
' + '
'.repeat(2) + '
'); + + value = LocalStorage.getItem("sse-mobile-macros-mode"); + if (value === null) { + value = appOptions.customization ? appOptions.customization.macrosMode : 'warn'; + value = (value === 'enable') ? 1 : (value === 'disable' ? 2 : 0); + } else { + value = parseInt(value); + } + this.props.storeApplicationSettings.changeMacrosSettings(value); }; const loadDocument = data => { @@ -127,17 +155,16 @@ class MainController extends Component { docInfo.put_Permissions(_permissions); docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys); - // var enable = !this.editorConfig.customization || (this.editorConfig.customization.macros!==false); - // docInfo.asc_putIsEnabledMacroses(!!enable); - // enable = !this.editorConfig.customization || (this.editorConfig.customization.plugins!==false); - // docInfo.asc_putIsEnabledPlugins(!!enable); - - // SSE.getController('Toolbar').setDocumentTitle(data.doc.title); + const appOptions = this.props.storeAppOptions; + let enable = !appOptions.customization || (appOptions.customization.macros !== false); + docInfo.asc_putIsEnabledMacroses(!!enable); + enable = !appOptions.customization || (appOptions.customization.plugins!==false); + docInfo.asc_putIsEnabledPlugins(!!enable); } this.api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions); - // this.api.asc_registerCallback('asc_onLicenseChanged', _.bind(this.onLicenseChanged, this)); - // this.api.asc_registerCallback('asc_onRunAutostartMacroses', _.bind(this.onRunAutostartMacroses, this)); + this.api.asc_registerCallback('asc_onLicenseChanged', this.onLicenseChanged.bind(this)); + this.api.asc_registerCallback('asc_onRunAutostartMacroses', this.onRunAutostartMacroses.bind(this)); this.api.asc_setDocInfo(docInfo); this.api.asc_getEditorPermissions(this.editorConfig.licenseUrl, this.editorConfig.customerId); this.api.asc_enableKeyEvents(true); @@ -152,21 +179,20 @@ class MainController extends Component { }; const onEditorPermissions = params => { - let me = this; const licType = params.asc_getLicenseType(); + this.appOptions.canLicense = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit); - me.appOptions.canLicense = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit); + const appOptions = this.props.storeAppOptions; + appOptions.setPermissionOptions(this.document, licType, params, this.permissions); - this.props.storeAppOptions.setPermissionOptions(this.document, licType, params, this.permissions); - // me.appOptions.canEdit = (me.permissions.edit !== false || me.permissions.review === true) && // can edit or review - // (me.editorConfig.canRequestEditRights || me.editorConfig.mode !== 'view') && // if mode=="view" -> canRequestEditRights must be defined - // (!me.appOptions.isReviewOnly || me.appOptions.canLicense) && // if isReviewOnly==true -> canLicense must be true - // me.isSupportEditFeature(); - // me.appOptions.isEdit = me.appOptions.canLicense && me.appOptions.canEdit && me.editorConfig.mode !== 'view'; + this.applyMode(appOptions); - // me.api.asc_setViewMode(!me.appOptions.isEdit); - me.api.asc_setViewMode(false); - me.api.asc_LoadDocument(); + this.api.asc_LoadDocument(); + + //if (!me.appOptions.isEdit) { + //me.hidePreloader(); + //me.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); + //} }; const _process_array = (array, fn) => { @@ -184,30 +210,64 @@ class MainController extends Component { _process_array(dep_scripts, promise_get_script) .then ( result => { const {t} = this.props; + const _t = t('Controller.Main.SDK', {returnObjects:true}) + const styleNames = ['Normal', 'Neutral', 'Bad', 'Good', 'Input', 'Output', 'Calculation', 'Check Cell', 'Explanatory Text', 'Note', 'Linked Cell', 'Warning Text', + 'Heading 1', 'Heading 2', 'Heading 3', 'Heading 4', 'Title', 'Total', 'Currency', 'Percent', 'Comma']; + const translate = { + 'Series': _t.txtSeries, + 'Diagram Title': _t.txtDiagramTitle, + 'X Axis': _t.txtXAxis, + 'Y Axis': _t.txtYAxis, + 'Your text here': _t.txtArt + }; + styleNames.forEach(function(item){ + translate[item] = _t['txtStyle_' + item.replace(/ /g, '_')] || item; + }); + translate['Currency [0]'] = _t.txtStyle_Currency + ' [0]'; + translate['Comma [0]'] = _t.txtStyle_Comma + ' [0]'; + + for (let i=1; i<7; i++) { + translate['Accent'+i] = _t.txtAccent + i; + translate['20% - Accent'+i] = '20% - ' + _t.txtAccent + i; + translate['40% - Accent'+i] = '40% - ' + _t.txtAccent + i; + translate['60% - Accent'+i] = '60% - ' + _t.txtAccent + i; + } this.api = new Asc.spreadsheet_api({ 'id-view': 'editor_sdk', 'id-input': 'idx-cell-content', - 'mobile': true - // 'translate': translate + 'mobile': true, + 'translate': translate }); + Common.Notifications.trigger('engineCreated', this.api); Common.EditorApi = {get: () => this.api}; this.appOptions = {}; this.bindEvents(); - let value = null /*Common.localStorage.getItem("sse-settings-fontrender")*/; - if (value===null) value = window.devicePixelRatio > 1 ? '1' : '3'; + let value = LocalStorage.getItem("sse-settings-fontrender"); + if (value === null) value = window.devicePixelRatio > 1 ? '1' : '3'; this.api.asc_setFontRenderingMode(parseInt(value)); Common.Utils.Metric.setCurrentMetric(Common.Utils.Metric.c_MetricUnits.pt); // TODO: beautify c_MetricUnits - Common.Gateway.on('init', loadConfig); - // Common.Gateway.on('showmessage', _.bind(me.onExternalMessage, me)); + Common.Gateway.on('init', loadConfig); + Common.Gateway.on('showmessage', this.onExternalMessage.bind(this)); Common.Gateway.on('opendocument', loadDocument); Common.Gateway.appReady(); - Common.Notifications.trigger('engineCreated', this.api); + Common.Gateway.on('internalcommand', function(data) { + if (data.command === 'hardBack') { + if ($$('.modal-in').length > 0) { + if ( !($$('.error-dialog.modal-in').length > 0) ) { + f7.dialog.close(); + } + Common.Gateway.internalMessage('hardBack', false); + } else + Common.Gateway.internalMessage('hardBack', true); + } + }); + Common.Gateway.internalMessage('listenHardBack'); }, error => { console.log('promise failed ' + error); }); @@ -221,18 +281,12 @@ class MainController extends Component { } bindEvents() { - const me = this; - - // me.api.asc_registerCallback('asc_onError', _.bind(me.onError, me)); - me.api.asc_registerCallback('asc_onOpenDocumentProgress', me._onOpenDocumentProgress.bind(me)); - // me.api.asc_registerCallback('asc_onAdvancedOptions', _.bind(me.onAdvancedOptions, me)); - // me.api.asc_registerCallback('asc_onDocumentUpdateVersion', _.bind(me.onUpdateVersion, me)); - // me.api.asc_registerCallback('asc_onServerVersion', _.bind(me.onServerVersion, me)); - // me.api.asc_registerCallback('asc_onPrintUrl', _.bind(me.onPrintUrl, me)); - // me.api.asc_registerCallback('asc_onDocumentName', _.bind(me.onDocumentName, me)); - me.api.asc_registerCallback('asc_onEndAction', me._onLongActionEnd.bind(me)); - - EditorUIController.initThemeColors && EditorUIController.initThemeColors(); + this.api.asc_registerCallback('asc_onDocumentUpdateVersion', this.onUpdateVersion.bind(this)); + this.api.asc_registerCallback('asc_onServerVersion', this.onServerVersion.bind(this)); + this.api.asc_registerCallback('asc_onPrintUrl', this.onPrintUrl.bind(this)); + this.api.asc_registerCallback('asc_onPrint', this.onPrint.bind(this)); + this.api.asc_registerCallback('asc_onDocumentName', this.onDocumentName.bind(this)); + this.api.asc_registerCallback('asc_onEndAction', this._onLongActionEnd.bind(this)); EditorUIController.initCellInfo && EditorUIController.initCellInfo(this.props); @@ -263,42 +317,431 @@ class MainController extends Component { if ( type === Asc.c_oAscAsyncActionType.BlockInteraction && id == Asc.c_oAscAsyncAction.Open ) { Common.Gateway.internalMessage('documentReady', {}); Common.Notifications.trigger('document:ready'); - this._onDocumentContentReady(); + this.onDocumentContentReady(); } } - _onDocumentContentReady() { - const me = this; + onDocumentContentReady() { + if (this._isDocReady) + return; - me.api.asc_Resize(); + const appOptions = this.props.storeAppOptions; + const appSettings = this.props.storeApplicationSettings; - let value = null /*(this.appOptions.isEditMailMerge || this.appOptions.isEditDiagram) ? 100 : Common.localStorage.getItem("sse-settings-zoom")*/; - var zf = (value !== null) ? parseInt(value)/100 : (this.appOptions.customization && this.appOptions.customization.zoom ? parseInt(this.appOptions.customization.zoom)/100 : 1); + this._isDocReady = true; + + this.api.asc_showWorksheet(this.api.asc_getActiveWorksheetIndex()); + this.api.asc_Resize(); + + Common.Notifications.trigger('preloader:close'); + Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument); + + let value = (appOptions.isEditMailMerge || appOptions.isEditDiagram) ? 100 : LocalStorage.getItem("sse-settings-zoom"); + var zf = (value !== null) ? parseInt(value)/100 : (appOptions.customization && appOptions.customization.zoom ? parseInt(appOptions.customization.zoom)/100 : 1); this.api.asc_setZoom(zf>0 ? zf : 1); - // this.api.asc_SetFastCollaborative(false); + this.updateWindowTitle(true); - me.api.asc_enableKeyEvents(true); - me.api.asc_getWorksheetsCount(); - me.api.asc_showWorksheet(me.api.asc_getActiveWorksheetIndex()); + if (appOptions.isEdit) { + if (this.needToUpdateVersion) { + Common.Notifications.trigger('api:disconnect'); + } + } + + if (appOptions.canAnalytics && false) { + Common.component.Analytics.initialize('UA-12442749-13', 'Spreadsheet Editor'); + } + + Common.Gateway.on('processsaveresult', this.onProcessSaveResult.bind(this)); + Common.Gateway.on('processrightschange', this.onProcessRightsChange.bind(this)); + Common.Gateway.on('downloadas', this.onDownloadAs.bind(this)); + Common.Gateway.on('requestclose', this.onRequestClose.bind(this)); + + Common.Gateway.sendInfo({ + mode: appOptions.isEdit ? 'edit' : 'view' + }); this.applyLicense(); + //R1C1 reference style + value = LocalStorage.getBool('sse-settings-r1c1', false); + appSettings.changeRefStyle(value); + this.api.asc_setR1C1Mode(value); + Common.Gateway.documentReady(); f7.emit('resize'); } - _onOpenDocumentProgress(progress) { - // if (this.loadMask) { - // var $title = $$(this.loadMask).find('.modal-title'), - // const proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount()); + applyMode (appOptions) { + this.api.asc_enableKeyEvents(appOptions.isEdit); - // $title.text(this.textLoadingDocument + ': ' + Math.min(Math.round(proc * 100), 100) + '%'); - // } + if (!appOptions.isEditMailMerge && !appOptions.isEditDiagram) { + EditorUIController.initThemeColors && EditorUIController.initThemeColors(); + this.api.asc_registerCallback('asc_onDownloadUrl', this.onDownloadUrl.bind(this)); + } + + this.api.asc_setViewMode(!appOptions.isEdit && !appOptions.isRestrictedEdit); + (appOptions.isRestrictedEdit && appOptions.canComments) && this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyComments); + + let value = LocalStorage.getItem('sse-mobile-settings-unit'); + value = (value !== null) ? parseInt(value) : (appOptions.customization && appOptions.customization.unit ? Common.Utils.Metric.c_MetricUnits[appOptions.customization.unit.toLocaleLowerCase()] : Common.Utils.Metric.getDefaultMetric()); + (value === undefined) && (value = Common.Utils.Metric.getDefaultMetric()); + Common.Utils.Metric.setCurrentMetric(value); + + this.api.asc_registerCallback('asc_onDocumentModifiedChanged', this.onDocumentModifiedChanged.bind(this)); + this.api.asc_registerCallback('asc_onDocumentCanSaveChanged', this.onDocumentCanSaveChanged.bind(this)); + + //if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType.BlockInteraction})) { + //me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, ApplyEditRights); + //} else if (!this._isDocReady) { + //me.hidePreloader(); + //me.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); + //} + + // Message on window close + window.onbeforeunload = this.onBeforeUnload.bind(this); + window.onunload = this.onUnload.bind(this); + } + + onLicenseChanged (params) { + const appOptions = this.props.storeAppOptions; + if (appOptions.isEditDiagram || appOptions.isEditMailMerge) return; + + const licType = params.asc_getLicenseType(); + if (licType !== undefined && appOptions.canEdit && appOptions.config.mode !== 'view' && + (licType === Asc.c_oLicenseResult.Connections || licType === Asc.c_oLicenseResult.UsersCount || licType === Asc.c_oLicenseResult.ConnectionsOS || licType === Asc.c_oLicenseResult.UsersCountOS + || licType === Asc.c_oLicenseResult.SuccessLimit && (appOptions.trialMode & Asc.c_oLicenseMode.Limited) !== 0)) + this._state.licenseType = licType; + + if (this._isDocReady && this._state.licenseType) + this.applyLicense(); } applyLicense () { - Common.Notifications.trigger('toolbar:activatecontrols'); + const _t = this._t; + const warnNoLicense = _t.warnNoLicense.replace(/%1/g, __COMPANY_NAME__); + const warnNoLicenseUsers = _t.warnNoLicenseUsers.replace(/%1/g, __COMPANY_NAME__); + const textNoLicenseTitle = _t.textNoLicenseTitle.replace(/%1/g, __COMPANY_NAME__); + const warnLicenseExceeded = _t.warnLicenseExceeded.replace(/%1/g, __COMPANY_NAME__); + const warnLicenseUsersExceeded = _t.warnLicenseUsersExceeded.replace(/%1/g, __COMPANY_NAME__); + + const appOptions = this.props.storeAppOptions; + if (appOptions.config.mode !== 'view' && !EditorUIController.isSupportEditFeature()) { + let value = LocalStorage.getItem("sse-opensource-warning"); + value = (value !== null) ? parseInt(value) : 0; + const now = (new Date).getTime(); + if (now - value > 86400000) { + LocalStorage.setItem("sse-opensource-warning", now); + f7.dialog.create({ + title: _t.notcriticalErrorTitle, + text : _t.errorOpensource, + buttons: [{text: 'OK'}] + }).open(); + } + Common.Notifications.trigger('toolbar:activatecontrols'); + return; + } + + if (this._state.licenseType) { + let license = this._state.licenseType; + let buttons = [{text: 'OK'}]; + if ((appOptions.trialMode & Asc.c_oLicenseMode.Limited) !== 0 && + (license === Asc.c_oLicenseResult.SuccessLimit || + license === Asc.c_oLicenseResult.ExpiredLimited || + appOptions.permissionsLicense === Asc.c_oLicenseResult.SuccessLimit) + ) { + license = (license === Asc.c_oLicenseResult.ExpiredLimited) ? _t.warnLicenseLimitedNoAccess : _t.warnLicenseLimitedRenewed; + } else if (license === Asc.c_oLicenseResult.Connections || license === Asc.c_oLicenseResult.UsersCount) { + license = (license===Asc.c_oLicenseResult.Connections) ? warnLicenseExceeded : warnLicenseUsersExceeded; + } else { + license = (license === Asc.c_oLicenseResult.ConnectionsOS) ? warnNoLicense : warnNoLicenseUsers; + buttons = [{ + text: _t.textBuyNow, + bold: true, + onClick: function() { + window.open(`${__PUBLISHER_URL__}`, "_blank"); + } + }, + { + text: _t.textContactUs, + onClick: function() { + window.open(`mailto:${__SALES_EMAIL__}`, "_blank"); + } + }]; + } + if (this._state.licenseType === Asc.c_oLicenseResult.SuccessLimit) { + Common.Notifications.trigger('toolbar:activatecontrols'); + } else { + Common.Notifications.trigger('toolbar:activatecontrols'); + Common.Notifications.trigger('toolbar:deactivateeditcontrols'); + Common.Notifications.trigger('api:disconnect'); + } + + let value = LocalStorage.getItem("sse-license-warning"); + value = (value !== null) ? parseInt(value) : 0; + const now = (new Date).getTime(); + + if (now - value > 86400000) { + LocalStorage.setItem("sse-license-warning", now); + f7.dialog.create({ + title: textNoLicenseTitle, + text : license, + buttons: buttons + }).open(); + } + } else { + if (!appOptions.isDesktopApp && !appOptions.canBrandingExt && + appOptions.config && appOptions.config.customization && (appOptions.config.customization.loaderName || appOptions.config.customization.loaderLogo)) { + f7.dialog.create({ + title: _t.textPaidFeature, + text : _t.textCustomLoader, + buttons: [{ + text: _t.textContactUs, + bold: true, + onClick: () => { + window.open(`mailto:${__SALES_EMAIL__}`, "_blank"); + } + }, + { text: _t.textClose }] + }).open(); + } + Common.Notifications.trigger('toolbar:activatecontrols'); + } + } + + onExternalMessage (msg) { + if (msg && msg.msg) { + msg.msg = (msg.msg).toString(); + f7.notification.create({ + //title: uiApp.params.modalTitle, + text: [msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)], + closeButton: true + }).open(); + + Common.component.Analytics.trackEvent('External Error'); + } + } + + onRunAutostartMacroses () { + const appOptions = this.props.storeAppOptions; + const enable = !appOptions.customization || (appOptions.customization.macros !== false); + if (enable) { + const value = this.props.storeApplicationSettings.macrosMode; + if (value === 1) { + this.api.asc_runAutostartMacroses(); + } else if (value === 0) { + const _t = this._t; + f7.dialog.create({ + title: _t.notcriticalErrorTitle, + text: _t.textHasMacros, + content: `
+ + ${_t.textRemember} +
`, + buttons: [{ + text: _t.textYes, + onClick: () => { + const dontshow = $$('input[name="checkbox-show-macros"]').prop('checked'); + if (dontshow) { + this.props.storeApplicationSettings.changeMacrosSettings(1); + LocalStorage.setItem("sse-mobile-macros-mode", 1); + } + setTimeout(() => { + this.api.asc_runAutostartMacroses(); + }, 1); + }}, + { + text: _t.textNo, + onClick: () => { + const dontshow = $$('input[name="checkbox-show-macros"]').prop('checked'); + if (dontshow) { + this.props.storeApplicationSettings.changeMacrosSettings(2); + LocalStorage.setItem("sse-mobile-macros-mode", 2); + } + } + }] + }).open(); + } + } + } + + onDownloadUrl () { + if (this._state.isFromGatewayDownloadAs) { + Common.Gateway.downloadAs(url); + } + + this._state.isFromGatewayDownloadAs = false; + } + + onBeforeUnload () { + const _t = this._t; + + LocalStorage.save(); + + const config = this.props.storeAppOptions.config; + const isEdit = this.permissions.edit !== false && config.mode !== 'view' && config.mode !== 'editdiagram'; + if (isEdit && this.api.asc_isDocumentModified()) { + this.api.asc_stopSaving(); + this.continueSavingTimer = window.setTimeout(() => { + this.api.asc_continueSaving(); + }, 500); + + return _t.leavePageText; + } + } + + onUnload () { + if (this.continueSavingTimer) + clearTimeout(this.continueSavingTimer); + } + + onUpdateVersion (callback) { + const _t = this._t; + + this.needToUpdateVersion = true; + Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument); + + f7.dialog.alert( + _t.errorUpdateVersion, + _t.titleUpdateVersion, + () => { + Common.Gateway.updateVersion(); + if (callback) { + callback.call(this); + } + Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument); + }); + } + + onServerVersion (buildVersion) { + if (this.changeServerVersion) return true; + const _t = this._t; + + if (About.appVersion() !== buildVersion && !About.compareVersions()) { + this.changeServerVersion = true; + f7.dialog.alert( + _t.errorServerVersion, + _t.titleServerVersion, + () => { + setTimeout(() => {Common.Gateway.updateVersion()}, 0); + }); + return true; + } + return false; + } + + onPrintUrl (url) { + if (this.iframePrint) { + this.iframePrint.parentNode.removeChild(this.iframePrint); + this.iframePrint = null; + } + + if (!this.iframePrint) { + this.iframePrint = document.createElement("iframe"); + this.iframePrint.id = "id-print-frame"; + this.iframePrint.style.display = 'none'; + this.iframePrint.style.visibility = "hidden"; + this.iframePrint.style.position = "fixed"; + this.iframePrint.style.right = "0"; + this.iframePrint.style.bottom = "0"; + document.body.appendChild(this.iframePrint); + this.iframePrint.onload = function() { + this.iframePrint.contentWindow.focus(); + this.iframePrint.contentWindow.print(); + this.iframePrint.contentWindow.blur(); + window.focus(); + }; + } + + if (url) { + this.iframePrint.src = url; + } + } + + onDocumentName (name) { + this.updateWindowTitle(true); + } + + updateWindowTitle (force) { + const isModified = this.api.asc_isDocumentModified(); + if (this._state.isDocModified !== isModified || force) { + const title = this.defaultTitleText; + + if (window.document.title !== title) { + window.document.title = title; + } + + this._isDocReady && (this._state.isDocModified !== isModified) && Common.Gateway.setDocumentModified(isModified); + this._state.isDocModified = isModified; + } + } + + onDocumentModifiedChanged () { + const isModified = this.api.asc_isDocumentCanSave(); + if (this._state.isDocModified !== isModified) { + this._isDocReady && Common.Gateway.setDocumentModified(this.api.asc_isDocumentModified()); + } + + this.updateWindowTitle(); + } + + onDocumentCanSaveChanged (isCanSave) { + // + } + + onPrint () { + if (!this.props.storeAppOptions.canPrint) return; + + if (this.api) + this.api.asc_Print(); + Common.component.Analytics.trackEvent('Print'); + } + + onProcessSaveResult (data) { + this.api.asc_OnSaveEnd(data.result); + + if (data && data.result === false) { + const _t = this._t; + f7.dialog.alert( + (!data.message) ? _t.errorProcessSaveResult : data.message, + _t.criticalErrorTitle + ); + } + } + + onProcessRightsChange (data) { + if (data && data.enabled === false) { + const appOptions = this.props.storeAppOptions; + const old_rights = appOptions.lostEditingRights; + appOptions.changeEditingRights(!old_rights); + this.api.asc_coAuthoringDisconnect(); + Common.Notifications.trigger('api:disconnect'); + + if (!old_rights) { + const _t = this._t; + f7.dialog.alert( + (!data.message) ? _t.warnProcessRightsChange : data.message, + _t.notcriticalErrorTitle, + () => { appOptions.changeEditingRights(false); } + ); + } + } + } + + onDownloadAs () { + if ( this.props.storeAppOptions.canDownload) { + Common.Gateway.reportError(Asc.c_oAscError.ID.AccessDeny, this._t.errorAccessDeny); + return; + } + this._state.isFromGatewayDownloadAs = true; + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.XLSX, true)); + } + + onRequestClose () { + Common.Gateway.requestClose(); } render() { diff --git a/apps/spreadsheeteditor/mobile/src/store/appOptions.js b/apps/spreadsheeteditor/mobile/src/store/appOptions.js index 75900a131..f33a3736f 100644 --- a/apps/spreadsheeteditor/mobile/src/store/appOptions.js +++ b/apps/spreadsheeteditor/mobile/src/store/appOptions.js @@ -14,9 +14,18 @@ export class storeAppOptions { config = {}; canViewComments = false; - setConfigOptions (config) { + setConfigOptions (config, _t) { this.config = config; - this.user = Common.Utils.fillUserInfo(config.user, config.lang, "Local.User"/*me.textAnonymous*/); + this.customization = config.customization; + this.canRenameAnonymous = !((typeof (this.customization) == 'object') && (typeof (this.customization.anonymous) == 'object') && (this.customization.anonymous.request===false)); + this.guestName = (typeof (this.customization) == 'object') && (typeof (this.customization.anonymous) == 'object') && + (typeof (this.customization.anonymous.label) == 'string') && this.customization.anonymous.label.trim()!=='' ? + Common.Utils.String.htmlEncode(this.customization.anonymous.label) : _t.textGuest; + + const value = this.canRenameAnonymous ? Common.localStorage.getItem("guest-username") : null; + this.user = Common.Utils.fillUserInfo(config.user, config.lang, value ? (value + ' (' + this.guestName + ')' ) : _t.textAnonymous); + + config.user = this.user; this.isDesktopApp = config.targetApp == 'desktop'; this.canCreateNew = !!config.createUrl && !this.isDesktopApp; this.canOpenRecent = config.recent !== undefined && !this.isDesktopApp; From ad5104c8c59236caea4c5c5f9c54029cd0f3a320 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 26 Apr 2021 18:43:12 +0300 Subject: [PATCH 23/23] [mobile] Fix long actions controller --- .../mobile/src/controller/LongActions.jsx | 5 ++++- apps/presentationeditor/mobile/locale/en.json | 4 +++- .../mobile/src/controller/LongActions.jsx | 11 +++++++++-- .../mobile/src/controller/LongActions.jsx | 5 ++++- 4 files changed, 20 insertions(+), 5 deletions(-) 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) => {