diff --git a/apps/documenteditor/mobile/src/page/main.jsx b/apps/documenteditor/mobile/src/page/main.jsx index 3a48f88e1..cac56243e 100644 --- a/apps/documenteditor/mobile/src/page/main.jsx +++ b/apps/documenteditor/mobile/src/page/main.jsx @@ -135,12 +135,13 @@ class MainPage extends Component { const disabledSettings = storeToolbarSettings.disabledSettings; const config = appOptions.config; - let showLogo = !(appOptions.canBrandingExt && (config.customization && (config.customization.loaderName || config.customization.loaderLogo))); + let showLogo = !(config.customization && (config.customization.loaderName || config.customization.loaderLogo)); if (!Object.keys(config).length) { showLogo = !/&(?:logo)=/.test(window.location.search); } const showPlaceholder = !appOptions.isDocReady && (!config.customization || !(config.customization.loaderName || config.customization.loaderLogo)); + const isBranding = appOptions.canBranding || appOptions.canBrandingExt; if ($$('.skl-container').length) { $$('.skl-container').remove(); } @@ -148,16 +149,20 @@ class MainPage extends Component { return ( {/* Top Navbar */} - - {showLogo && appOptions.canBranding !== undefined &&
{ - window.open(`${__PUBLISHER_URL__}`, "_blank"); - }}>
} - - - - -
+ {config?.customization && + + {(!isBranding && showLogo) && +
{ + window.open(`${__PUBLISHER_URL__}`, "_blank"); + }}>
} + + + + +
+ } {/* Page content */} diff --git a/apps/presentationeditor/mobile/src/page/main.jsx b/apps/presentationeditor/mobile/src/page/main.jsx index d3012f5c7..9df9d4b6a 100644 --- a/apps/presentationeditor/mobile/src/page/main.jsx +++ b/apps/presentationeditor/mobile/src/page/main.jsx @@ -13,6 +13,7 @@ import ContextMenu from '../controller/ContextMenu'; import { Toolbar } from "../controller/Toolbar"; import { AddLinkController } from '../controller/add/AddLink'; import { EditLinkController } from '../controller/edit/EditLink'; + class MainPage extends Component { constructor(props) { super(props); @@ -112,26 +113,32 @@ class MainPage extends Component { const appOptions = this.props.storeAppOptions; const config = appOptions.config; - let showLogo = !(appOptions.canBrandingExt && (config.customization && (config.customization.loaderName || config.customization.loaderLogo))); + let showLogo = !(config.customization && (config.customization.loaderName || config.customization.loaderLogo)); if ( !Object.keys(config).length ) { showLogo = !/&(?:logo)=/.test(window.location.search); } const showPlaceholder = !appOptions.isDocReady && (!config.customization || !(config.customization.loaderName || config.customization.loaderLogo)); + const isBranding = appOptions.canBranding || appOptions.canBrandingExt; + return ( {!this.state.previewVisible ? null : } {/* Top Navbar */} - - {showLogo && appOptions.canBranding !== undefined &&
{ - window.open(`${__PUBLISHER_URL__}`, "_blank"); - }}>
} - - - - -
+ {config?.customization && + + {(!isBranding && showLogo) &&
{ + window.open(`${__PUBLISHER_URL__}`, "_blank"); + }}>
} + + + + +
+ } {/* Page content */} diff --git a/apps/spreadsheeteditor/mobile/src/page/main.jsx b/apps/spreadsheeteditor/mobile/src/page/main.jsx index a8273ad6f..dc0a82233 100644 --- a/apps/spreadsheeteditor/mobile/src/page/main.jsx +++ b/apps/spreadsheeteditor/mobile/src/page/main.jsx @@ -107,12 +107,14 @@ class MainPage extends Component { const wsLock = storeWorksheets.wsLock; const config = appOptions.config; - let showLogo = !(appOptions.canBrandingExt && (config.customization && (config.customization.loaderName || config.customization.loaderLogo))); + let showLogo = !(config.customization && (config.customization.loaderName || config.customization.loaderLogo)); if ( !Object.keys(config).length ) { showLogo = !/&(?:logo)=/.test(window.location.search); } const showPlaceholder = !appOptions.isDocReady && (!config.customization || !(config.customization.loaderName || config.customization.loaderLogo)); + const isBranding = appOptions.canBranding || appOptions.canBrandingExt; + if ( $$('.skl-container').length ) { $$('.skl-container').remove(); } @@ -120,16 +122,19 @@ class MainPage extends Component { return ( {/* Top Navbar */} - - {showLogo && appOptions.canBranding !== undefined &&
{ - window.open(`${__PUBLISHER_URL__}`, "_blank"); - }}>
} - - - - -
+ {config?.customization && + + {(!isBranding && showLogo) &&
{ + window.open(`${__PUBLISHER_URL__}`, "_blank"); + }}>
} + + + + +
+ } this.handleClickToOpenOptions('add', {panels: panels, button: button})}/> {/* Page content */}