IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2

Browse Source
This commit is contained in:
Alexey Safronov 2022-06-21 13:03:31 +03:00
commit 66cdf0bdaf
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
products/ASC.Files/Client/src/HOCs/withLoader.js
View File

@ -6,6 +6,7 @@ import Loaders from "@appserver/common/components/Loaders";
const pathname = window.location.pathname.toLowerCase();
const isEditor = pathname.indexOf("doceditor") !== -1;
const isGallery = pathname.indexOf("form-gallery") !== -1;
let loadTimeout = null;
const withLoader = (WrappedComponent) => (Loader) => {
@ -52,7 +53,7 @@ const withLoader = (WrappedComponent) => (Loader) => {
}
}, [isEditor, firstLoad, isLoaded, isMobile, inLoad]);
return (!isEditor && firstLoad) ||
return (!isEditor && firstLoad && !isGallery) ||
!isLoaded ||
(isMobile && inLoad) ||
(isLoadingFilesFind && !Loader) ||