Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
This commit is contained in:
commit
5ee228ffbd
@ -142,7 +142,7 @@ const Layout = (props) => {
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
const bannerHeight = isBannerVisible ? 80 : 0;
|
const bannerHeight = isBannerVisible ? 80 : 0;
|
||||||
let vh = (windowHeight - 48 - bannerHeight) * 0.01;
|
let vh = (windowHeight - bannerHeight) * 0.01;
|
||||||
document.documentElement.style.setProperty("--vh", `${vh}px`);
|
document.documentElement.style.setProperty("--vh", `${vh}px`);
|
||||||
setContentHeight(height);
|
setContentHeight(height);
|
||||||
};
|
};
|
||||||
@ -186,6 +186,6 @@ export default inject(({ auth, bannerStore }) => {
|
|||||||
return {
|
return {
|
||||||
isTabletView: auth.settingsStore.isTabletView,
|
isTabletView: auth.settingsStore.isTabletView,
|
||||||
setIsTabletView: auth.settingsStore.setIsTabletView,
|
setIsTabletView: auth.settingsStore.setIsTabletView,
|
||||||
isBannerVisible: bannerStore.isBannerVisible,
|
isBannerVisible: false, // bannerStore.isBannerVisible, TODO: use isBannerVisible from bannerStore after fix
|
||||||
};
|
};
|
||||||
})(observer(Layout));
|
})(observer(Layout));
|
||||||
|
@ -19,30 +19,11 @@ const StyledMain = styled.main`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
const Main = React.memo((props) => {
|
const Main = React.memo((props) => {
|
||||||
// const orientationChanged = React.useCallback(() => {
|
|
||||||
// if (isIOS && !isFirefox) {
|
|
||||||
// let vh = (window.innerHeight - 48) * 0.01;
|
|
||||||
// document.documentElement.style.setProperty("--vh", `${vh}px`);
|
|
||||||
// }
|
|
||||||
// }, []);
|
|
||||||
|
|
||||||
// React.useEffect(() => {
|
|
||||||
// orientationChanged();
|
|
||||||
// if (isIOS && !isFirefox) {
|
|
||||||
// window.addEventListener("resize", orientationChanged);
|
|
||||||
// }
|
|
||||||
// return () => window.removeEventListener("resize", orientationChanged);
|
|
||||||
// }, []);
|
|
||||||
|
|
||||||
//console.log("Main render");
|
//console.log("Main render");
|
||||||
|
|
||||||
return <StyledMain className="main" {...props} />;
|
return <StyledMain className="main" {...props} />;
|
||||||
});
|
});
|
||||||
|
|
||||||
/*Main.defaultProps = {
|
|
||||||
fullscreen: false
|
|
||||||
};*/
|
|
||||||
|
|
||||||
Main.displayName = "Main";
|
Main.displayName = "Main";
|
||||||
|
|
||||||
export default Main;
|
export default Main;
|
||||||
|
@ -28,7 +28,7 @@ class DeleteProfileEverDialogComponent extends React.Component {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
onDeleteProfileEver = () => {
|
onDeleteProfileEver = () => {
|
||||||
const { user, t, history, homepage, setFilter } = this.props;
|
const { user, t, history, homepage, setFilter, onClose } = this.props;
|
||||||
|
|
||||||
const filter = Filter.getDefault();
|
const filter = Filter.getDefault();
|
||||||
const params = filter.toUrlParams();
|
const params = filter.toUrlParams();
|
||||||
@ -47,7 +47,8 @@ class DeleteProfileEverDialogComponent extends React.Component {
|
|||||||
setFilter(filter);
|
setFilter(filter);
|
||||||
return;
|
return;
|
||||||
})
|
})
|
||||||
.catch((error) => toastr.error(error));
|
.catch((error) => toastr.error(error))
|
||||||
|
.finally(() => onClose());
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user