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' ? [