From 3dd26e178b8a8a6b85613af230ce75822e42b1f3 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 20 Apr 2021 12:47:57 +0300 Subject: [PATCH] [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 cb6035fa78..a2fc8d61f7 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 061f1eae91..849e4760d9 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 10daaf4419..d0ca26d720 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'),