From 9e3f0fff9a8541fef44ca2d4c8688f4c950832b4 Mon Sep 17 00:00:00 2001 From: Chris Collins <1-cirx08@users.noreply.gitlab.cirx08.com> Date: Sat, 23 Aug 2025 14:49:08 +0100 Subject: [PATCH] Prerel 1.7.2.6 --- .gitignore | 2 +- .../Views/Account/Partials/GalleriesList.cshtml | 2 +- WeddingShare/Views/Gallery/GalleryOptions.cshtml | 9 +++++---- .../Views/Gallery/GalleryPagination.cshtml | 2 ++ WeddingShare/Views/Gallery/Index.cshtml | 2 +- WeddingShare/Views/Gallery/Modes/Default.cshtml | 2 +- WeddingShare/appsettings.json | 2 +- WeddingShare/wwwroot/js/media-viewer.js | 16 +++------------- 8 files changed, 15 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index da03931..29cca84 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,4 @@ /WeddingShare/wwwroot/banners /WeddingShare/wwwroot/images/custom_resources /WeddingShare/config/wedding-share.db.bak -/WeddingShare/config/key-c8502003-3735-4a35-8488-69a3a0736916.xml +/WeddingShare/config/key-*.xml diff --git a/WeddingShare/Views/Account/Partials/GalleriesList.cshtml b/WeddingShare/Views/Account/Partials/GalleriesList.cshtml index 2a7afcf..115927a 100644 --- a/WeddingShare/Views/Account/Partials/GalleriesList.cshtml +++ b/WeddingShare/Views/Account/Partials/GalleriesList.cshtml @@ -51,7 +51,7 @@ @if (userPermissions.HasFlag(AccessPermissions.Gallery_View)) { - + () { "partial" })" data-target="@(await _settings.GetOrDefault(Settings.Basic.LinksOpenNewTab, true) ? "_blank" : "_self")" alt="Open"> } @if (userPermissions.HasFlag(AccessPermissions.Gallery_Download)) { diff --git a/WeddingShare/Views/Gallery/GalleryOptions.cshtml b/WeddingShare/Views/Gallery/GalleryOptions.cshtml index eca9e1a..17af75a 100644 --- a/WeddingShare/Views/Gallery/GalleryOptions.cshtml +++ b/WeddingShare/Views/Gallery/GalleryOptions.cshtml @@ -9,6 +9,7 @@ var userPermissions = User?.Identity?.GetUserPermissions() ?? AccessPermissions.None; var qrCodeEnabled = await _settings.GetOrDefault(Settings.Gallery.QRCode.Enabled, true, Model?.Gallery?.Id); var showFilters = await _settings.GetOrDefault(Settings.Gallery.ShowFilters, true, Model?.Gallery?.Id); + var excludeFromUrls = new List() { "partial" }; } @if (qrCodeEnabled) @@ -67,7 +68,7 @@ { new KeyValuePair("mode", ((int)mode).ToString()) }; - @_localizer[mode.ToString()].Value + @_localizer[mode.ToString()].Value } @@ -83,7 +84,7 @@ { new KeyValuePair("group", ((int)group).ToString()) }; - @_localizer[group.ToString()].Value + @_localizer[group.ToString()].Value } @@ -99,7 +100,7 @@ { new KeyValuePair("order", ((int)order).ToString()) }; - @_localizer[order.ToString()].Value + @_localizer[order.ToString()].Value } @@ -115,7 +116,7 @@ { new KeyValuePair("filter", ((int)filter).ToString()) }; - @_localizer[filter.ToString()].Value + @_localizer[filter.ToString()].Value } diff --git a/WeddingShare/Views/Gallery/GalleryPagination.cshtml b/WeddingShare/Views/Gallery/GalleryPagination.cshtml index acd4267..c3f2a88 100644 --- a/WeddingShare/Views/Gallery/GalleryPagination.cshtml +++ b/WeddingShare/Views/Gallery/GalleryPagination.cshtml @@ -5,6 +5,8 @@ var queryString = HttpUtility.ParseQueryString(Context.Request.QueryString.ToString()); queryString.Remove("page"); queryString.Remove("Page"); + queryString.Remove("partial"); + queryString.Remove("Partial"); var pageUrl = $"/{Context.Request.Path.ToString()?.TrimStart('/')?.TrimEnd('?')}?{queryString.ToString()?.TrimStart('?')}"; } diff --git a/WeddingShare/Views/Gallery/Index.cshtml b/WeddingShare/Views/Gallery/Index.cshtml index ba9c1cb..e526177 100644 --- a/WeddingShare/Views/Gallery/Index.cshtml +++ b/WeddingShare/Views/Gallery/Index.cshtml @@ -32,7 +32,7 @@ catch { } } - var qrExclude = new List(); + var qrExclude = new List() { "partial" }; if (await _settings.GetOrDefault(Settings.Basic.HideKeyFromQRCode, false)) { qrExclude.Add("key"); diff --git a/WeddingShare/Views/Gallery/Modes/Default.cshtml b/WeddingShare/Views/Gallery/Modes/Default.cshtml index e2a2599..57263c9 100644 --- a/WeddingShare/Views/Gallery/Modes/Default.cshtml +++ b/WeddingShare/Views/Gallery/Modes/Default.cshtml @@ -133,7 +133,7 @@ var image = imageGroupImages.ElementAt(index);
- + @if (image?.MediaType == MediaType.Video) { diff --git a/WeddingShare/appsettings.json b/WeddingShare/appsettings.json index ce01017..664e1e8 100644 --- a/WeddingShare/appsettings.json +++ b/WeddingShare/appsettings.json @@ -158,7 +158,7 @@ } }, "Release": { - "Version": "1.7.2.5" + "Version": "1.7.2.6" }, "Sponsors": { "Url": "https://sponsors.wedding-share.org", diff --git a/WeddingShare/wwwroot/js/media-viewer.js b/WeddingShare/wwwroot/js/media-viewer.js index 75c39db..0e90cbd 100644 --- a/WeddingShare/wwwroot/js/media-viewer.js +++ b/WeddingShare/wwwroot/js/media-viewer.js @@ -125,7 +125,9 @@ function moveSlide(direction) { index = 0; } - openMediaViewer(items[index]); + let slide = $(`a[data-media-viewer-index='${index}']`); + + openMediaViewer(slide); } (function () { @@ -133,18 +135,6 @@ function moveSlide(direction) { clearTimeout(playButtonTimeout); playButtonTimeout = setTimeout(function () { - let collections = []; - - $('.media-viewer-item').each(function () { - let name = $(this).data('media-viewer-collection'); - if (!collections.includes(name)) { - collections.push(name); - $(`*[data-media-viewer-collection='${name}']`).each(function (i) { - $(this).attr('data-media-viewer-index', i); - }); - } - }); - $('.media-viewer-item .media-viewer-play').each(function () { let element = $(this); let preview = element.parent();