diff --git a/apps/common/mobile/lib/controller/Plugins.jsx b/apps/common/mobile/lib/controller/Plugins.jsx index e4f889def..2c64eaa2f 100644 --- a/apps/common/mobile/lib/controller/Plugins.jsx +++ b/apps/common/mobile/lib/controller/Plugins.jsx @@ -46,7 +46,6 @@ const PluginsController = inject('storeAppOptions')(observer(props => { api.asc_pluginButtonClick(index); }; - const showPluginModal = (plugin, variationIndex, frameId, urlAddition) => { let isAndroid = Device.android; let variation = plugin.get_Variations()[variationIndex]; @@ -68,7 +67,8 @@ const PluginsController = inject('storeAppOptions')(observer(props => { if ((storeAppOptions.isEdit || b.isViewer !== false)) { newBtns[index] = { text: b.text, - attributes: {result: index} + attributes: {result: index}, + close: false }; } }); @@ -123,8 +123,8 @@ const PluginsController = inject('storeAppOptions')(observer(props => { }; const pluginClose = plugin => { - if (iframe) { - iframe = null; + if (plugin) { + modal.close(); } }; diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index b8292d970..efea54205 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -784,9 +784,6 @@ input[type="number"]::-webkit-inner-spin-button { padding: 0; text-align: left; font-size: 16px; - span { - padding: 0; - } } } .picker-center-highlight { diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 441904234..bfb173832 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -134,14 +134,14 @@ }, "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.", + "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" }, "Common": { "ThemeColorPalette": { "textThemeColors": "Theme Colors", - "textStandartColors": "Standart Colors", + "textStandartColors": "Standard Colors", "textCustomColors": "Custom Colors" }, "Collaboration": { diff --git a/apps/documenteditor/mobile/src/less/icons-material.less b/apps/documenteditor/mobile/src/less/icons-material.less index 71c229de1..03e09345e 100644 --- a/apps/documenteditor/mobile/src/less/icons-material.less +++ b/apps/documenteditor/mobile/src/less/icons-material.less @@ -26,6 +26,16 @@ height: 22px; .encoded-svg-background(''); } + &.icon-prev { + width: 20px; + height: 20px; + .encoded-svg-background(''); + } + &.icon-next { + width: 20px; + height: 20px; + .encoded-svg-background(''); + } &.icon-expand-down { width: 22px; height: 22px; diff --git a/apps/documenteditor/mobile/src/view/edit/Edit.jsx b/apps/documenteditor/mobile/src/view/edit/Edit.jsx index bd9bb4c7a..42001e455 100644 --- a/apps/documenteditor/mobile/src/view/edit/Edit.jsx +++ b/apps/documenteditor/mobile/src/view/edit/Edit.jsx @@ -202,7 +202,7 @@ const EditLayoutNavbar = ({ editors, inPopover }) => { editors.length > 1 ?
{editors.map((item, index) => {item.caption})} - {isAndroid && } + {isAndroid && }
: { editors[0].caption } } diff --git a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx index a539c9339..6d0981d07 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx @@ -147,6 +147,7 @@ const PageStyle = props => { const types = storeChartSettings.types; const curType = chartProperties ? chartProperties.getType() : null; const chartStyles = storeChartSettings.chartStyles; + const isAndroid = Device.android; // console.log(chartStyles, curType); // console.log(Asc.c_oAscChartTypeSettings.comboBarLine, Asc.c_oAscChartTypeSettings.comboBarLineSecondary, Asc.c_oAscChartTypeSettings.comboAreaBar, Asc.c_oAscChartTypeSettings.comboCustom); @@ -184,6 +185,7 @@ const PageStyle = props => { {chartStyles ? {_t.textStyle} : null} {_t.textFill} {_t.textBorder} + {isAndroid && } {Device.phone && diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx index 227dc6f1f..b4c785b50 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx @@ -144,6 +144,7 @@ const PageStyle = props => { const _t = t('Edit', {returnObjects: true}); const storeShapeSettings = props.storeShapeSettings; const shapeObject = props.storeFocusObjects.shapeObject; + const isAndroid = Device.android; let borderSize, borderType, transparent; if (shapeObject) { @@ -177,9 +178,10 @@ const PageStyle = props => {
- {_t.textFill} - {_t.textBorder} - {_t.textEffects} + {_t.textFill} + {_t.textBorder} + {_t.textEffects} + {isAndroid && }
{Device.phone && diff --git a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx index 528c3bf23..d17639b5b 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx @@ -466,6 +466,7 @@ const PageStyle = props => { const _t = t('Edit', {returnObjects: true}); const storeTableSettings = props.storeTableSettings; const templates = storeTableSettings.styles; + const isAndroid = Device.android; const tableObject = props.storeFocusObjects.tableObject; if (!tableObject && Device.phone) { @@ -477,9 +478,10 @@ const PageStyle = props => {
- {_t.textStyle} - {_t.textFill} - {_t.textBorder} + {_t.textStyle} + {_t.textFill} + {_t.textBorder} + {isAndroid && }
{Device.phone && diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index c7de2720b..343ef9533 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -148,7 +148,7 @@ }, "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.", + "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" }, diff --git a/apps/presentationeditor/mobile/src/view/edit/Edit.jsx b/apps/presentationeditor/mobile/src/view/edit/Edit.jsx index 3f9537494..f4d43fb8a 100644 --- a/apps/presentationeditor/mobile/src/view/edit/Edit.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/Edit.jsx @@ -231,7 +231,7 @@ const EditLayoutNavbar = ({ editors, inPopover }) => { editors.length > 1 ?
{editors.map((item, index) => {item.caption})} - {isAndroid && } + {isAndroid && }
: { editors[0].caption } } diff --git a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx index 2112aa589..a9929cc34 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx @@ -159,6 +159,7 @@ const PageStyle = props => { const styles = storeChartSettings.styles; const shapeObject = props.storeFocusObjects.shapeObject; const chartStyles = storeChartSettings.chartStyles; + const isAndroid = Device.android; let borderSize, borderType, borderColor; @@ -194,6 +195,7 @@ const PageStyle = props => { {chartStyles ? {_t.textStyle} : null} {_t.textFill} {_t.textBorder} + {isAndroid && } {Device.phone && diff --git a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx index 71210945c..39a55a8b4 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx @@ -89,6 +89,7 @@ const PageStyle = props => { const storeFocusObjects = props.storeFocusObjects; const storeShapeSettings = props.storeShapeSettings; const shapeObject = storeFocusObjects.shapeObject; + const isAndroid = Device.android; let borderSize, borderType, transparent; if (shapeObject) { @@ -125,6 +126,7 @@ const PageStyle = props => { {_t.textFill} {_t.textBorder} {_t.textEffects} + {isAndroid && } {Device.phone && diff --git a/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx b/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx index 4557b9f72..2db973287 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx @@ -310,7 +310,7 @@ const PageTransition = props => { - {_t.textApplyAll} + {_t.textApplyAll} ); diff --git a/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx b/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx index 2377f9295..789ba0a45 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx @@ -313,14 +313,16 @@ const PageStyle = props => { const _t = t('View.Edit', {returnObjects: true}); const storeTableSettings = props.storeTableSettings; const templates = storeTableSettings.styles; + const isAndroid = Device.android; return (
- {_t.textStyle} - {_t.textFill} - {_t.textBorder} + {_t.textStyle} + {_t.textFill} + {_t.textBorder} + {isAndroid && }
{Device.phone && diff --git a/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx b/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx index 9fbb4f59f..54a805d50 100644 --- a/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx +++ b/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx @@ -16,14 +16,14 @@ const PageApplicationSettings = props => { }; // set mode - // const appOptions = props.storeAppOptions; - // const _isEdit = appOptions.isEdit; + const appOptions = props.storeAppOptions; + const _isEdit = appOptions.isEdit; // const _isShowMacros = (!appOptions.isDisconnected && appOptions.customization) ? appOptions.customization.macros !== false : true; return ( - {/* {_isEdit && */} + {_isEdit && {_t.textUnitOfMeasurement} @@ -46,7 +46,7 @@ const PageApplicationSettings = props => { - {/* } */} + } {/* {_isShowMacros && */} { ); }; -const ApplicationSettings = inject("storeApplicationSettings")(observer(PageApplicationSettings)); +const ApplicationSettings = inject("storeApplicationSettings", "storeAppOptions")(observer(PageApplicationSettings)); const MacrosSettings = inject("storeApplicationSettings")(observer(PageMacrosSettings)); export {ApplicationSettings, MacrosSettings}; \ No newline at end of file diff --git a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx index 22f9a2339..6a3704aea 100644 --- a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx +++ b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx @@ -130,9 +130,11 @@ const SettingsList = inject("storeAppOptions")(observer(props => { : null} - - - + {_isEdit && + + + + } diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 8c9a6f6b0..56819cc2f 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -193,7 +193,7 @@ }, "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.", + "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" }, diff --git a/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx b/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx index 320a6e650..af1fbf4c2 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx @@ -94,7 +94,8 @@ const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, isDocReady '' + '
' + '', - buttons: buttons + buttons: buttons, + cssClass: 'dlg-adv-options' }).open(); const recommendedSettings = advOptions.asc_getRecommendedSettings(); diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx index 3df3425df..2115c773d 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx @@ -296,7 +296,7 @@ const EditLayoutNavbar = ({ editors, inPopover }) => { editors.length > 1 ?
{editors.map((item, index) => {item.caption})} - {isAndroid && } + {isAndroid && }
: { editors[0].caption } } diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx index 7662e68fa..66e0d6e43 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx @@ -147,6 +147,7 @@ const PageBorderColor = props => { const PageStyle = props => { const { t } = useTranslation(); const _t = t('View.Edit', {returnObjects: true}); + const isAndroid = Device.android; const storeChartSettings = props.storeChartSettings; const storeFocusObjects = props.storeFocusObjects; const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties(); @@ -195,6 +196,7 @@ const PageStyle = props => { {chartStyles ? {_t.textStyle} : null} {_t.textFill} {_t.textBorder} + {isAndroid && } {Device.phone && diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx index dd3eeb6e5..ef6ffd9d7 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx @@ -83,6 +83,7 @@ const PaletteFill = inject("storeFocusObjects", "storeShapeSettings", "storePale const PageStyle = props => { const { t } = useTranslation(); const _t = t('View.Edit', {returnObjects: true}); + const isAndroid = Device.android; const storeShapeSettings = props.storeShapeSettings; const storeFocusObjects = props.storeFocusObjects; const shapeObject = storeFocusObjects.shapeObject.get_ShapeProperties(); @@ -121,6 +122,7 @@ const PageStyle = props => { {_t.textFill} {_t.textBorder} {_t.textEffects} + {isAndroid && } {Device.phone && diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx index 9039e0cda..d2738b577 100644 --- a/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx @@ -27,14 +27,14 @@ const PageApplicationSettings = props => { }; // set mode - // const appOptions = props.storeAppOptions; - // const _isEdit = appOptions.isEdit; + const appOptions = props.storeAppOptions; + const _isEdit = appOptions.isEdit; // const _isShowMacros = (!appOptions.isDisconnected && appOptions.customization) ? appOptions.customization.macros !== false : true; return ( - {/* {_isEdit && */} + {_isEdit && {_t.textUnitOfMeasurement} @@ -59,39 +59,40 @@ const PageApplicationSettings = props => { onRegSettings: props.onRegSettings }}> - {_t.textCommentingDisplay} - - - {_t.textComments} - { - storeApplicationSettings.changeDisplayComments(!isComments); - props.onChangeDisplayComments(!isComments); - }} - /> - - - {_t.textResolvedComments} - { - storeApplicationSettings.changeDisplayResolved(!isResolvedComments); - props.onChangeDisplayResolved(!isResolvedComments); - }} - /> - - - - - {_t.textR1C1Style} - { - storeApplicationSettings.changeRefStyle(!isRefStyle); - props.clickR1C1Style(!isRefStyle); - }} - /> - - + } + {_t.textCommentingDisplay} + + + {_t.textComments} + { + storeApplicationSettings.changeDisplayComments(!isComments); + props.onChangeDisplayComments(!isComments); + }} + /> + + + {_t.textResolvedComments} + { + storeApplicationSettings.changeDisplayResolved(!isResolvedComments); + props.onChangeDisplayResolved(!isResolvedComments); + }} + /> + + + + + {_t.textR1C1Style} + { + storeApplicationSettings.changeRefStyle(!isRefStyle); + props.clickR1C1Style(!isRefStyle); + }} + /> + + {/* } */} {/* {_isShowMacros && */} diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx index 6d3793350..ac8caca6e 100644 --- a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx @@ -138,9 +138,11 @@ const SettingsList = inject("storeAppOptions")(observer(props => { : null} - - - + {_isEdit && + + + + }