mirror of
https://github.com/ONLYOFFICE/web-apps.git
synced 2026-02-10 18:05:32 +08:00
Merge pull request '[mobile] Fix bug 77821' (#830) from fix/bug-77821 into fix/bug-78114
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/web-apps/pulls/830
This commit is contained in:
@ -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);
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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");
|
||||
};
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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");
|
||||
};
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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");
|
||||
};
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user