Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

fix(gallery):restore-spinner-for-photos-and-live-photos

Aswin Asokb0ecf08658ea
diff --git a/web/packages/gallery/components/viewer/photoswipe-core.ts b/web/packages/gallery/components/viewer/photoswipe-core.ts
index be963b1c7e..704413f123 100644
--- a/web/packages/gallery/components/viewer/photoswipe-core.ts
+++ b/web/packages/gallery/components/viewer/photoswipe-core.ts
@@ -839,11 +839,20 @@ export class FileViewerPhotoSwipe<
const ui = pswp.ui!;
ui.uiElementsData.find((e) => e.name == "zoom")!.order = 6;
- const preloaderIndex = ui.uiElementsData.findIndex(
+ const preloader = ui.uiElementsData.find(
(e) => e.name == "preloader",
- );
- if (preloaderIndex != -1)
- ui.uiElementsData.splice(preloaderIndex, 1);
+ )!;
+ preloader.order = 10;
+ const initPreloader = preloader.onInit!;
+ preloader.onInit = (element, pswp) => {
+ initPreloader(element, pswp);
+ pswp.on("change", () => {
+ element.style.display =
+ currSlideData().fileType == FileType.video
+ ? "none"
+ : "";
+ });
+ };
const lastProgressByFileID = new Map<
number,
@@ -877,6 +886,7 @@ export class FileViewerPhotoSwipe<
const rememberDownloadProgress = () => {
if (progressClosed || !pswp.currSlide) return;
const itemData = currSlideData();
+ if (itemData.fileType != FileType.video) return;
const { fileID } = itemData;
const state = downloadProgressState(
itemData,
@@ -930,6 +940,10 @@ export class FileViewerPhotoSwipe<
[progressValue, "pswp__ente-progress-overlay"],
[progressBar, "pswp__ente-progress-bar"],
] as const) {
+ element.style.display =
+ currSlideData().fileType == FileType.video
+ ? ""
+ : "none";
element.classList.toggle(`${prefix}--active`, !!state);
element.classList.toggle(`${prefix}--failed`, failed);
element.classList.toggle(
diff --git a/web/packages/gallery/styles/photoswipe.css b/web/packages/gallery/styles/photoswipe.css
index 3db2de9717..ab71f8646f 100644
--- a/web/packages/gallery/styles/photoswipe.css
+++ b/web/packages/gallery/styles/photoswipe.css
@@ -44,6 +44,14 @@
pointer-events: auto;
}
+.pswp-ente .pswp__preloader--active .pswp__icn {
+ opacity: 0.4;
+}
+
+.pswp-ente .pswp__preloader {
+ transform: translate(-2px, 2px);
+}
+
.pswp-ente .pswp__error {
position: relative;
overflow: hidden;