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/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..df6cd83aa 100644
--- a/apps/presentationeditor/mobile/src/controller/Preview.jsx
+++ b/apps/presentationeditor/mobile/src/controller/Preview.jsx
@@ -4,8 +4,97 @@ 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 = () => {
+ props.onclosed();
+ };
+
return (
)
diff --git a/apps/presentationeditor/mobile/src/page/main.jsx b/apps/presentationeditor/mobile/src/page/main.jsx
index e5e86581a..4739278e2 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,49 @@ 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 :
+
+ }
+
+
+
+ )
+ }
}
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 (
- <>
-
+
)
};
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'),