From 5c211f016c12ef0e37bc284ab3411f2f914e3839 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Fri, 11 Feb 2022 09:56:54 +0300 Subject: [PATCH] [DE PE SSE] Fix Bug 49275 --- apps/documenteditor/mobile/locale/en.json | 1 + .../mobile/src/controller/settings/Settings.jsx | 12 ++++++++++++ apps/documenteditor/mobile/src/less/icons-ios.less | 7 ++++++- .../mobile/src/less/icons-material.less | 7 ++++++- .../mobile/src/view/settings/Settings.jsx | 9 ++++++--- apps/presentationeditor/mobile/locale/en.json | 1 + .../mobile/src/less/icons-ios.less | 8 +++++++- .../mobile/src/less/icons-material.less | 8 +++++++- .../mobile/src/view/settings/Settings.jsx | 14 +++++++++++++- apps/spreadsheeteditor/mobile/locale/en.json | 1 + .../mobile/src/less/icons-ios.less | 7 ++++++- .../mobile/src/less/icons-material.less | 7 ++++++- .../mobile/src/view/settings/Settings.jsx | 14 +++++++++++++- 13 files changed, 85 insertions(+), 11 deletions(-) diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index d8e847909..a1e96ec40 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -548,6 +548,7 @@ "textFindAndReplaceAll": "Find and Replace All", "textFormat": "Format", "textHelp": "Help", + "textFeedback": "Feedback & Support", "textHiddenTableBorders": "Hidden Table Borders", "textHighlightResults": "Highlight Results", "textInch": "Inch", diff --git a/apps/documenteditor/mobile/src/controller/settings/Settings.jsx b/apps/documenteditor/mobile/src/controller/settings/Settings.jsx index d32e6b456..1fd31d171 100644 --- a/apps/documenteditor/mobile/src/controller/settings/Settings.jsx +++ b/apps/documenteditor/mobile/src/controller/settings/Settings.jsx @@ -67,6 +67,17 @@ const Settings = props => { }, 400); }; + const showFeedback = () => { + let config = props.storeAppOptions.config; + + closeModal(); + setTimeout(() => { + if(config && !!config.feedback && !!config.feedback.url) { + window.open(config.feedback.url, "_blank"); + } else window.open('{{SUPPORT_URL}}', "_blank"); + }, 400); + } + const onOrthographyCheck = () => { closeModal(); setTimeout(() => { @@ -87,6 +98,7 @@ const Settings = props => { onReaderMode={onReaderMode} onPrint={onPrint} showHelp={showHelp} + showFeedback={showFeedback} onOrthographyCheck={onOrthographyCheck} onDownloadOrigin={onDownloadOrigin} /> diff --git a/apps/documenteditor/mobile/src/less/icons-ios.less b/apps/documenteditor/mobile/src/less/icons-ios.less index 99205059b..58a68b07c 100644 --- a/apps/documenteditor/mobile/src/less/icons-ios.less +++ b/apps/documenteditor/mobile/src/less/icons-ios.less @@ -74,13 +74,18 @@ &.icon-help { width: 22px; height: 22px; - .encoded-svg-mask(''); + .encoded-svg-mask(''); } &.icon-about { width: 22px; height: 22px; .encoded-svg-mask(''); } + &.icon-feedback { + width: 22px; + height: 22px; + .encoded-svg-mask(''); + } // Download diff --git a/apps/documenteditor/mobile/src/less/icons-material.less b/apps/documenteditor/mobile/src/less/icons-material.less index bc3b9c640..9dfdd6d0e 100644 --- a/apps/documenteditor/mobile/src/less/icons-material.less +++ b/apps/documenteditor/mobile/src/less/icons-material.less @@ -129,13 +129,18 @@ &.icon-help { width: 22px; height: 22px; - .encoded-svg-mask(''); + .encoded-svg-mask(''); } &.icon-about { width: 22px; height: 22px; .encoded-svg-mask(''); } + &.icon-feedback { + width: 22px; + height: 22px; + .encoded-svg-mask(''); + } // Download diff --git a/apps/documenteditor/mobile/src/view/settings/Settings.jsx b/apps/documenteditor/mobile/src/view/settings/Settings.jsx index 654004353..662f78f11 100644 --- a/apps/documenteditor/mobile/src/view/settings/Settings.jsx +++ b/apps/documenteditor/mobile/src/view/settings/Settings.jsx @@ -165,7 +165,7 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props => {_canHelp && - + } @@ -174,6 +174,9 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props => } + + + @@ -196,10 +199,10 @@ class SettingsView extends Component { return ( show_popover ? this.props.onclosed()}> - + : this.props.onclosed()}> - + ) } diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 855036af1..2c1d1073d 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -423,6 +423,7 @@ "textFindAndReplace": "Find and Replace", "textFindAndReplaceAll": "Find and Replace All", "textHelp": "Help", + "textFeedback": "Feedback & Support", "textHighlight": "Highlight Results", "textInch": "Inch", "textLastModified": "Last Modified", diff --git a/apps/presentationeditor/mobile/src/less/icons-ios.less b/apps/presentationeditor/mobile/src/less/icons-ios.less index 3c7a619c5..fa0a77037 100644 --- a/apps/presentationeditor/mobile/src/less/icons-ios.less +++ b/apps/presentationeditor/mobile/src/less/icons-ios.less @@ -88,7 +88,13 @@ &.icon-help { width: 22px; height: 22px; - .encoded-svg-mask(''); + .encoded-svg-mask(''); + } + + &.icon-feedback { + width: 22px; + height: 22px; + .encoded-svg-mask(''); } &.icon-setup { diff --git a/apps/presentationeditor/mobile/src/less/icons-material.less b/apps/presentationeditor/mobile/src/less/icons-material.less index 23488b3a3..c3185d510 100644 --- a/apps/presentationeditor/mobile/src/less/icons-material.less +++ b/apps/presentationeditor/mobile/src/less/icons-material.less @@ -76,7 +76,13 @@ &.icon-help { width: 22px; height: 22px; - .encoded-svg-mask(''); + .encoded-svg-mask(''); + } + + &.icon-feedback { + width: 22px; + height: 22px; + .encoded-svg-mask(''); } &.icon-setup { diff --git a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx index c82a192ec..907cdf9be 100644 --- a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx +++ b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx @@ -111,6 +111,15 @@ const SettingsList = inject("storeAppOptions", "storeToolbarSettings")(observer( window.open(url, "_blank"); }; + const showFeedback = () => { + let config = props.storeAppOptions.config; + + closeModal(); + if(config && !!config.feedback && !!config.feedback.url) { + window.open(config.feedback.url, "_blank"); + } else window.open('{{SUPPORT_URL}}', "_blank"); + }; + const appOptions = props.storeAppOptions; let _isEdit = false; @@ -150,12 +159,15 @@ const SettingsList = inject("storeAppOptions", "storeToolbarSettings")(observer( - + + + + diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 170fbb674..da0e193c9 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -594,6 +594,7 @@ "textFormulaLanguage": "Formula Language", "textFormulas": "Formulas", "textHelp": "Help", + "textFeedback": "Feedback & Support", "textHideGridlines": "Hide Gridlines", "textHideHeadings": "Hide Headings", "textHighlightRes": "Highlight results", diff --git a/apps/spreadsheeteditor/mobile/src/less/icons-ios.less b/apps/spreadsheeteditor/mobile/src/less/icons-ios.less index 142989494..3c1757044 100644 --- a/apps/spreadsheeteditor/mobile/src/less/icons-ios.less +++ b/apps/spreadsheeteditor/mobile/src/less/icons-ios.less @@ -60,7 +60,12 @@ &.icon-help { width: 22px; height: 22px; - .encoded-svg-mask(''); + .encoded-svg-mask(''); + } + &.icon-feedback { + width: 22px; + height: 22px; + .encoded-svg-mask(''); } &.icon-versions { width: 22px; diff --git a/apps/spreadsheeteditor/mobile/src/less/icons-material.less b/apps/spreadsheeteditor/mobile/src/less/icons-material.less index 8a2d5b1dd..81397c458 100644 --- a/apps/spreadsheeteditor/mobile/src/less/icons-material.less +++ b/apps/spreadsheeteditor/mobile/src/less/icons-material.less @@ -55,8 +55,13 @@ &.icon-help { width: 22px; height: 22px; - .encoded-svg-mask(''); + .encoded-svg-mask(''); } + &.icon-feedback { + width: 22px; + height: 22px; + .encoded-svg-mask(''); + } &.icon-versions { width: 22px; height: 22px; diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx index c3098cedb..2da10aef1 100644 --- a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx @@ -116,6 +116,15 @@ const SettingsList = inject("storeAppOptions")(observer(props => { window.open(url, "_blank"); }; + const showFeedback = () => { + let config = props.storeAppOptions.config; + + closeModal(); + if(config && !!config.feedback && !!config.feedback.url) { + window.open(config.feedback.url, "_blank"); + } else window.open('{{SUPPORT_URL}}', "_blank"); + }; + const appOptions = props.storeAppOptions; let _isEdit = false; @@ -155,12 +164,15 @@ const SettingsList = inject("storeAppOptions")(observer(props => { - + + + +