Merge pull request #347 from ONLYOFFICE/bugfix/js-sdk-propertys
Bugfix/js sdk propertys
This commit is contained in:
commit
a3813354eb
@ -86,6 +86,7 @@ const Shell = ({ items = [], page = "home", ...rest }) => {
|
||||
setConvertPasswordDialogVisible,
|
||||
version,
|
||||
pagesWithoutNavMenu,
|
||||
isFrame,
|
||||
} = rest;
|
||||
|
||||
const theme = useTheme();
|
||||
@ -429,13 +430,13 @@ const Shell = ({ items = [], page = "home", ...rest }) => {
|
||||
{toast}
|
||||
{/* <ReactSmartBanner t={t} ready={ready} /> */}
|
||||
{withoutNavMenu ? <></> : <NavMenu />}
|
||||
{currentDeviceType === DeviceType.mobile && <MainBar />}
|
||||
{currentDeviceType === DeviceType.mobile && !isFrame && <MainBar />}
|
||||
<IndicatorLoader />
|
||||
<ScrollToTop />
|
||||
<DialogsWrapper t={t} />
|
||||
|
||||
<Main isDesktop={isDesktop}>
|
||||
{currentDeviceType !== DeviceType.mobile && <MainBar />}
|
||||
{currentDeviceType !== DeviceType.mobile && !isFrame && <MainBar />}
|
||||
<div className="main-container">
|
||||
<Outlet />
|
||||
</div>
|
||||
@ -543,6 +544,7 @@ const ShellWrapper = inject(
|
||||
setConvertPasswordDialogVisible,
|
||||
version,
|
||||
pagesWithoutNavMenu,
|
||||
isFrame,
|
||||
};
|
||||
},
|
||||
)(observer(Shell));
|
||||
|
@ -73,6 +73,7 @@ const ArticleBodyContent = (props) => {
|
||||
currentDeviceType,
|
||||
campaigns,
|
||||
userId,
|
||||
isFrame,
|
||||
} = props;
|
||||
|
||||
const navigate = useNavigate();
|
||||
@ -265,9 +266,11 @@ const ArticleBodyContent = (props) => {
|
||||
activeItemId={activeItemId}
|
||||
/>
|
||||
|
||||
{!isDesktopClient && showText && !firstLoad && campaigns.length > 0 && (
|
||||
<Banner />
|
||||
)}
|
||||
{!isDesktopClient &&
|
||||
showText &&
|
||||
!firstLoad &&
|
||||
campaigns.length > 0 &&
|
||||
!isFrame && <Banner />}
|
||||
</>
|
||||
);
|
||||
};
|
||||
@ -314,6 +317,7 @@ export default inject(
|
||||
theme,
|
||||
setIsBurgerLoading,
|
||||
currentDeviceType,
|
||||
isFrame,
|
||||
} = settingsStore;
|
||||
|
||||
const { campaigns } = campaignsStore;
|
||||
@ -346,6 +350,7 @@ export default inject(
|
||||
setSelection,
|
||||
currentDeviceType,
|
||||
campaigns,
|
||||
isFrame,
|
||||
};
|
||||
},
|
||||
)(withTranslation([])(observer(ArticleBodyContent)));
|
||||
|
@ -419,11 +419,7 @@ class ProfileActionsStore {
|
||||
},
|
||||
];
|
||||
|
||||
if (
|
||||
!window.navigator.userAgent.includes("ZoomWebKit") &&
|
||||
!window.navigator.userAgent.includes("ZoomApps") &&
|
||||
showFrameSignOut
|
||||
) {
|
||||
if (showFrameSignOut) {
|
||||
actions.push({
|
||||
key: "user-menu-logout",
|
||||
icon: LogoutReactSvgUrl,
|
||||
|
Loading…
Reference in New Issue
Block a user