diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 1d27a693ad..8f3d8e6d9a 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -163,7 +163,6 @@ DE.ApplicationController = new(function(){ api.asc_setDocInfo(docInfo); api.asc_getEditorPermissions(config.licenseUrl, config.customerId); api.asc_enableKeyEvents(true); - common.controller.Shortcuts.setApi(api); Common.Analytics.trackEvent('Load', 'Start'); } @@ -495,6 +494,8 @@ DE.ApplicationController = new(function(){ embed: '#idt-embed' }); + common.controller.Shortcuts.setApi(api); + api.asc_registerCallback('asc_onStartAction', onLongActionBegin); api.asc_registerCallback('asc_onEndAction', onLongActionEnd); api.asc_registerCallback('asc_onMouseMoveStart', onDocMouseMoveStart); diff --git a/apps/documenteditor/mobile/src/controller/settings/Settings.jsx b/apps/documenteditor/mobile/src/controller/settings/Settings.jsx index 0da53fad47..46c9b564d4 100644 --- a/apps/documenteditor/mobile/src/controller/settings/Settings.jsx +++ b/apps/documenteditor/mobile/src/controller/settings/Settings.jsx @@ -56,8 +56,8 @@ const SettingsController = props => { closeModal(); setTimeout(() => { - if(config && !!config.feedback && !!config.feedback.url) { - window.open(config.feedback.url, "_blank"); + if(!!config?.customization?.feedback?.url) { + window.open(config.customization.feedback.url, "_blank"); } else window.open(__SUPPORT_URL__, "_blank"); }, 400); } diff --git a/apps/documenteditor/mobile/src/view/settings/SettingsPage.jsx b/apps/documenteditor/mobile/src/view/settings/SettingsPage.jsx index 549bf98daf..29993acda1 100644 --- a/apps/documenteditor/mobile/src/view/settings/SettingsPage.jsx +++ b/apps/documenteditor/mobile/src/view/settings/SettingsPage.jsx @@ -89,7 +89,10 @@ const SettingsPage = inject("storeAppOptions", "storeReview", "storeDocumentInfo if (appOptions.customization) { _canHelp = appOptions.customization.help !== false; - _canFeedback = appOptions.customization.feedback !== false; + _canFeedback = ( + appOptions.customization.feedback !== false && + appOptions.customization.feedback.visible !== false + ); _canDisplayInfo = appOptions.customization.mobile?.info !== false; } } diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index 96fe4b5414..0826062b5e 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -155,7 +155,6 @@ PE.ApplicationController = new(function(){ api.asc_setDocInfo(docInfo); api.asc_getEditorPermissions(config.licenseUrl, config.customerId); api.asc_enableKeyEvents(true); - common.controller.Shortcuts.setApi(api); Common.Analytics.trackEvent('Load', 'Start'); } @@ -351,6 +350,8 @@ PE.ApplicationController = new(function(){ embed: '#idt-embed' }); + common.controller.Shortcuts.setApi(api); + api.asc_registerCallback('asc_onMouseMoveStart', onDocMouseMoveStart); api.asc_registerCallback('asc_onMouseMoveEnd', onDocMouseMoveEnd); api.asc_registerCallback('asc_onMouseMove', onDocMouseMove); diff --git a/apps/presentationeditor/mobile/src/controller/settings/Settings.jsx b/apps/presentationeditor/mobile/src/controller/settings/Settings.jsx index 49322a20d9..f9b69b9f23 100644 --- a/apps/presentationeditor/mobile/src/controller/settings/Settings.jsx +++ b/apps/presentationeditor/mobile/src/controller/settings/Settings.jsx @@ -54,8 +54,8 @@ const SettingsController = props => { let config = props.storeAppOptions.config; closeModal(); - if(config && !!config.feedback && !!config.feedback.url) { - window.open(config.feedback.url, "_blank"); + if(!!config?.customization?.feedback?.url) { + window.open(config.customization.feedback.url, "_blank"); } else window.open(__SUPPORT_URL__, "_blank"); }; diff --git a/apps/presentationeditor/mobile/src/view/settings/SettingsPage.jsx b/apps/presentationeditor/mobile/src/view/settings/SettingsPage.jsx index f6c8939df1..0899c1dd2c 100644 --- a/apps/presentationeditor/mobile/src/view/settings/SettingsPage.jsx +++ b/apps/presentationeditor/mobile/src/view/settings/SettingsPage.jsx @@ -68,7 +68,10 @@ const SettingsPage = inject('storeAppOptions', 'storeToolbarSettings', 'storePre if (appOptions.customization) { _canHelp = appOptions.customization.help !== false; - _canFeedback = appOptions.customization.feedback !== false; + _canFeedback = ( + appOptions.customization.feedback !== false && + appOptions.customization.feedback.visible !== false + ); _canDisplayInfo = appOptions.customization.mobile?.info !== false; } } diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 8735473a90..d24a307d2f 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -171,7 +171,6 @@ SSE.ApplicationController = new(function(){ api.asc_setDocInfo(docInfo); api.asc_getEditorPermissions(config.licenseUrl, config.customerId); api.asc_enableKeyEvents(true); - common.controller.Shortcuts.setApi(api); Common.Analytics.trackEvent('Load', 'Start'); } @@ -435,6 +434,8 @@ SSE.ApplicationController = new(function(){ embed: '#idt-embed' }); + common.controller.Shortcuts.setApi(api); + api.asc_registerCallback('asc_onMouseMove', onApiMouseMove); api.asc_registerCallback('asc_onHyperlinkClick', onHyperlinkClick); api.asc_registerCallback('asc_onDownloadUrl', onDownloadUrl); diff --git a/apps/spreadsheeteditor/mobile/src/controller/settings/Settings.jsx b/apps/spreadsheeteditor/mobile/src/controller/settings/Settings.jsx index 1c4bfcb32f..dc28c8c03b 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/settings/Settings.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/settings/Settings.jsx @@ -55,8 +55,8 @@ const SettingsController = inject('storeAppOptions', 'storeSpreadsheetInfo')(obs let config = appOptions.config; closeModal(); - if(config && !!config.feedback && !!config.feedback.url) { - window.open(config.feedback.url, "_blank"); + if(!!config?.customization?.feedback?.url) { + window.open(config.customization.feedback.url, "_blank"); } else window.open(__SUPPORT_URL__, "_blank"); }; diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/SettingsPage.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/SettingsPage.jsx index 56c9b40a3c..3079919ad6 100644 --- a/apps/spreadsheeteditor/mobile/src/view/settings/SettingsPage.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/settings/SettingsPage.jsx @@ -68,7 +68,10 @@ const SettingsPage = inject('storeAppOptions', 'storeSpreadsheetInfo')(observer( if (appOptions.customization) { _canHelp = appOptions.customization.help !== false; - _canFeedback = appOptions.customization.feedback !== false; + _canFeedback = ( + appOptions.customization.feedback !== false && + appOptions.customization.feedback.visible !== false + ); _canDisplayInfo = appOptions.customization.mobile?.info !== false; } } diff --git a/apps/visioeditor/mobile/src/controller/settings/Settings.jsx b/apps/visioeditor/mobile/src/controller/settings/Settings.jsx index f099f6f8ea..a59e437c6d 100644 --- a/apps/visioeditor/mobile/src/controller/settings/Settings.jsx +++ b/apps/visioeditor/mobile/src/controller/settings/Settings.jsx @@ -54,8 +54,8 @@ const SettingsController = props => { let config = props.storeAppOptions.config; closeModal(); - if(config && !!config.feedback && !!config.feedback.url) { - window.open(config.feedback.url, "_blank"); + if(!!config?.customization?.feedback?.url) { + window.open(config.customization.feedback.url, "_blank"); } else window.open(__SUPPORT_URL__, "_blank"); }; diff --git a/apps/visioeditor/mobile/src/view/settings/SettingsPage.jsx b/apps/visioeditor/mobile/src/view/settings/SettingsPage.jsx index 0d02c91db4..17b5c101db 100644 --- a/apps/visioeditor/mobile/src/view/settings/SettingsPage.jsx +++ b/apps/visioeditor/mobile/src/view/settings/SettingsPage.jsx @@ -58,7 +58,10 @@ const SettingsPage = inject('storeAppOptions', 'storeVisioInfo')(observer(props if (appOptions.customization) { _canHelp = appOptions.customization.help !== false; - _canFeedback = appOptions.customization.feedback !== false; + _canFeedback = ( + appOptions.customization.feedback !== false && + appOptions.customization.feedback.visible !== false + ); _canDisplayInfo = appOptions.customization.mobile?.info !== false; } }