TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close 2

Browse Source
This commit is contained in:
Manav Rathi
2025-04-10 16:03:48 +05:30
parent 719c5584f7
commit 85c40dfe29
1 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
web/packages/gallery/components/viewer/photoswipe.ts
View File

@@ -316,7 +316,7 @@ export class FileViewerPhotoSwipe {
*/
const originalVideoFileIDs = new Set<number>();
const videoQualityForFileID = (fileID: number) =>
const intendedVideoQualityForFileID = (fileID: number) =>
originalVideoFileIDs.has(fileID) ? "original" : "auto";
// Provide data about slides to PhotoSwipe via callbacks
@@ -328,7 +328,7 @@ export class FileViewerPhotoSwipe {
const files = delegate.getFiles();
const file = files[index]!;
const videoQuality = videoQualityForFileID(file.id);
const videoQuality = intendedVideoQualityForFileID(file.id);
const itemData = itemDataForFile(file, { videoQuality }, () =>
pswp.refreshSlideContent(index),
@@ -528,24 +528,48 @@ export class FileViewerPhotoSwipe {
}
}
// TODO(HLS): Temporary gate
if (!shouldUsePlayerV2()) {
const qualityMenu =
container?.querySelector("#ente-quality-menu");
if (qualityMenu instanceof MediaChromeMenu) {
// Hide the auto option
qualityMenu.radioGroupItems[0]!.hidden = true;
}
return;
}
const qualityMenu = container?.querySelector("#ente-quality-menu");
if (qualityMenu instanceof MediaChromeMenu) {
const { videoPlaylistURL, fileID } = itemData;
// TODO(HLS): Temporary gate
if (!shouldUsePlayerV2() || !videoPlaylistURL) {
// Hide the auto option
qualityMenu.radioGroupItems[0]!.hidden = true;
// Hide the auto option, keeping track of if we did indeed
// change something.
const item = qualityMenu.radioGroupItems[0]!;
let didChangeHide = false;
if (item.hidden && videoPlaylistURL) {
didChangeHide = true;
item.hidden = false;
} else if (!item.hidden && !videoPlaylistURL) {
didChangeHide = true;
item.hidden = true;
}
const value =
intendedVideoQualityForFileID(fileID) == "auto" &&
videoPlaylistURL
? pt("Auto")
: pt("Original");
// Check first to avoid spurious updates.
if (qualityMenu.value != value) {
// Set a flag to avoid infinite update loop.
shouldIgnoreNextVideoQualityChange = true;
// Setting the value will close it.
qualityMenu.value = value;
} else {
qualityMenu.radioGroupItems[0]!.hidden = false;
const value =
videoQualityForFileID(fileID) == "auto"
? pt("Auto")
: pt("Original");
// Check first to avoid spurious updates.
if (qualityMenu.value != value) {
// Set a flag to avoid infinite update loop.
shouldIgnoreNextVideoQualityChange = true;
qualityMenu.value = value;
// Close it ourselves otherwise if we changed the menu.
if (didChangeHide) {
closeMediaChromeSettingsMenuIfOpen();
}
}
}
@@ -714,8 +738,6 @@ export class FileViewerPhotoSwipe {
() => void updateFileInfoExifIfNeeded(currSlideData()),
);
pswp.on("change", closeMediaChromeSettingsMenuIfOpen);
pswp.on("contentDestroy", (e) =>
forgetExifForItemData(asItemData(e.content.data)),
);