Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2126 from ONLYOFFICE/feature/fix-bugs

Browse source 
Feature/fix bugs
This commit is contained in:
maxkadushkin 2022-12-11 15:44:47 +03:00 committed by GitHub
parent 7188921e5a 8c7a5bafef
commit 835b383670
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/common/mobile/lib/view/SharingSettings.jsx
View file

@ -7,20 +7,11 @@ const ViewSharingSettings = props => {
const sharingSettingsUrl = props.sharingSettingsUrl; const sharingSettingsUrl = props.sharingSettingsUrl;
const _t = t('Common.Collaboration', {returnObjects: true}); const _t = t('Common.Collaboration', {returnObjects: true});
function resizeHeightIframe(selector) {
const iFrame = document.querySelector(selector);
iFrame.height = iFrame.contentWindow.document.body.scrollHeight;
};
useEffect(() => {
resizeHeightIframe('#sharing-placeholder iframe');
}, []);
return ( return (
<Page> <Page>
<Navbar title={t('Common.Collaboration.textSharingSettings')} backLink={_t.textBack} /> <Navbar title={t('Common.Collaboration.textSharingSettings')} backLink={_t.textBack} />
<div id="sharing-placeholder" className="sharing-placeholder"> <div id="sharing-placeholder" className="sharing-placeholder">
<iframe width="100%" frameBorder={0} scrolling="0" align="top" src={sharingSettingsUrl}></iframe> <iframe width="100%" height="500" frameBorder={0} scrolling="0" align="top" src={sharingSettingsUrl}></iframe>
</div> </div>
</Page> </Page>
) )

27
apps/documenteditor/mobile/src/page/main.jsx
View file

@ -157,21 +157,18 @@ class MainPage extends Component {
return ( return (
<Page name="home" className={`editor${showLogo ? ' page-with-logo' : ''}`}> <Page name="home" className={`editor${showLogo ? ' page-with-logo' : ''}`}>
{/* Top Navbar */} {/* Top Navbar */}
{config?.customization && <Navbar id='editor-navbar'
<Navbar id='editor-navbar' className={`main-navbar${(!isBranding && showLogo) ? ' navbar-with-logo' : ''}`}>
className={`main-navbar${(!isBranding && showLogo) ? ' navbar-with-logo' : ''}`}> {(!isBranding && showLogo) &&
{(!isBranding && showLogo) && <div className="main-logo" onClick={() => {
<div className="main-logo" onClick={() => { window.open(`${__PUBLISHER_URL__}`, "_blank");
window.open(`${__PUBLISHER_URL__}`, "_blank"); }}><Icon icon="icon-logo"></Icon></div>}
}}><Icon icon="icon-logo"></Icon></div>} <Subnavbar>
<Subnavbar> <Toolbar openOptions={this.handleClickToOpenOptions}
<Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/>
closeOptions={this.handleOptionsViewClosed}/> <Search useSuspense={false}/>
<Search useSuspense={false}/> </Subnavbar>
</Subnavbar> </Navbar>
</Navbar>
}
{/* Page content */} {/* Page content */}

27
apps/spreadsheeteditor/mobile/src/page/main.jsx
View file

@ -121,20 +121,19 @@ class MainPage extends Component {
return ( return (
<Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}> <Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}>
{/* Top Navbar */} {/* Top Navbar */}
{config?.customization && <Navbar id='editor-navbar'
<Navbar id='editor-navbar' className={`main-navbar${(!isBranding && showLogo) ? ' navbar-with-logo' : ''}`}>
className={`main-navbar${(!isBranding && showLogo) ? ' navbar-with-logo' : ''}`}> {(!isBranding && showLogo) && <div className="main-logo" onClick={() => {
{(!isBranding && showLogo) && <div className="main-logo" onClick={() => { window.open(`${__PUBLISHER_URL__}`, "_blank");
window.open(`${__PUBLISHER_URL__}`, "_blank"); }}><Icon icon="icon-logo"></Icon></div>}
}}><Icon icon="icon-logo"></Icon></div>} <Subnavbar>
<Subnavbar> <Toolbar openOptions={this.handleClickToOpenOptions}
<Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/>
closeOptions={this.handleOptionsViewClosed}/> <Search useSuspense={false}/>
<Search useSuspense={false}/> </Subnavbar>
</Subnavbar> </Navbar>
</Navbar>
}
<CellEditor onClickToOpenAddOptions={(panels, button) => this.handleClickToOpenOptions('add', {panels: panels, button: button})}/> <CellEditor onClickToOpenAddOptions={(panels, button) => this.handleClickToOpenOptions('add', {panels: panels, button: button})}/>
{/* Page content */} {/* Page content */}
<View id="editor_sdk" /> <View id="editor_sdk" />