From 9deec1998a64c85cf080bb2f658aedd124927600 Mon Sep 17 00:00:00 2001
From: "1152958806@qq.com" <17683872107czx>
Date: Mon, 28 Aug 2023 09:31:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=81=AF=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/album.html               |  2 +-
 templates/assets/js/custom.js      |  4 ++--
 templates/assets/js/main.js        |  9 ++-------
 templates/assets/js/utils.js       | 11 +----------
 templates/macro/bangumi-item.html  |  2 +-
 templates/macro/content-links.html |  4 ++--
 6 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/templates/album.html b/templates/album.html
index 94961ce7..05c2d856 100644
--- a/templates/album.html
+++ b/templates/album.html
@@ -42,7 +42,7 @@
                     <h2 style="text-align:center;">[[${theme.config.photos.bigTitle}]]</h2>
                     <div class="gallery-group-main">
                         <th:block th:each="group : ${photoFinder.groupBy()}">
-                            <figure class="gallery-group">
+                            <figure class="gallery-group no-lightbox">
                                 <img class="gallery-group-img no-lightbox"
                                      th:src="${isLazyload ? loadingImg : #annotations.get(group, 'cover')}"
                                      th:data-lazy-src="${ isLazyload ? #annotations.get(group, 'cover') : ''}"
diff --git a/templates/assets/js/custom.js b/templates/assets/js/custom.js
index 9f503b71..fd7011e5 100644
--- a/templates/assets/js/custom.js
+++ b/templates/assets/js/custom.js
@@ -374,8 +374,8 @@ document.addEventListener("DOMContentLoaded", () => {
                     function ($0, $1) {
                         var str = $1.split(",",4);
                         contents += `
-							<figure class="gallery-group group-two"">
-								<img class="gallery-group-img no-lightbox" 
+							<figure class="gallery-group no-lightbox group-two"">
+								<img class="gallery-group-img" 
 								src="${str[3]}" 
 								alt="Group Image Gallery" >
 								<figcaption>
diff --git a/templates/assets/js/main.js b/templates/assets/js/main.js
index 6230b404..a2688f03 100644
--- a/templates/assets/js/main.js
+++ b/templates/assets/js/main.js
@@ -131,13 +131,8 @@ document.addEventListener('DOMContentLoaded', function () {
             ele.each(function (i, o) {
                 const $this = $(o)
                 const lazyloadSrc = $this.attr('data-lazy-src') || $this.attr('src')
-                const lazyloadSrc1600 = lazyloadSrc + '_1600w'
                 const dataCaption = $this.attr('alt') || ''
-                if (lazyloadSrc.indexOf('!blogimg') != -1) {
-                    $this.wrap(`<a href="${lazyloadSrc}" data-fancybox="images" data-caption="${dataCaption}" class="fancybox" data-srcset="${lazyloadSrc1600} 1600w"></a>`)
-                } else {
-                    $this.wrap(`<a href="${lazyloadSrc}" data-fancybox="images" data-caption="${dataCaption}" class="fancybox" data-srcset="${lazyloadSrc} 1600w"></a>`)
-                }
+                $this.wrap(`<a href="${lazyloadSrc}" data-fancybox="images" data-caption="${dataCaption}" class="fancybox" data-srcset="${lazyloadSrc}"></a>`)
 
             })
 
@@ -163,7 +158,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
     const jqLoadAndRun = () => {
         const $fancyboxEle = GLOBAL_CONFIG.lightbox === 'fancybox'
-            ? document.querySelectorAll('#article-container :not(a):not(.gallery-group):not(.site-card-avatar):not(.flink-item-info):not(.rss-plan-info-group):not(.bangumi-picture):not(.introduction-card) > img, #article-container > img,.bber-container-img > img')
+            ? document.querySelectorAll('#article-container :not(a):not(.rss-plan-info-group):not(.no-lightbox) > img, #article-container > img,.bber-container-img > img')
             : []
         const fbLengthNoZero = $fancyboxEle.length > 0
         const $jgEle = document.querySelectorAll('#article-container .gallery')
diff --git a/templates/assets/js/utils.js b/templates/assets/js/utils.js
index 2bbb75c6..1c003e51 100644
--- a/templates/assets/js/utils.js
+++ b/templates/assets/js/utils.js
@@ -89,9 +89,6 @@ var btf = {
             }
         }
 
-
-
-
         /**
          * fancybox
          */
@@ -100,14 +97,8 @@ var btf = {
                 ele.each(function (i, o) {
                     const $this = $(o)
                     const lazyloadSrc = $this.attr('data-lazy-src') || $this.attr('src')
-                    const lazyloadSrc1600 = lazyloadSrc + '_1600w'
                     const dataCaption = $this.attr('alt') || ''
-                    if (lazyloadSrc.indexOf('!blogimg') != -1) {
-                        $this.wrap(`<a href="${lazyloadSrc}" data-fancybox="images" data-caption="${dataCaption}" class="fancybox" data-srcset="${lazyloadSrc1600} 1600w"></a>`)
-                    } else {
-                        $this.wrap(`<a href="${lazyloadSrc}" data-fancybox="images" data-caption="${dataCaption}" class="fancybox" data-srcset="${lazyloadSrc} 1600w"></a>`)
-                    }
-
+                    $this.wrap(`<a href="${lazyloadSrc}" data-fancybox="images" data-caption="${dataCaption}" class="fancybox" data-srcset="${lazyloadSrc}"></a>`)
                 })
 
                 $().fancybox({
diff --git a/templates/macro/bangumi-item.html b/templates/macro/bangumi-item.html
index e1930676..b83ed476 100644
--- a/templates/macro/bangumi-item.html
+++ b/templates/macro/bangumi-item.html
@@ -2,7 +2,7 @@
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <th:block th:fragment="bangumi-item(spec)">
     <div class="bangumi-item">
-        <div class="bangumi-picture">
+        <div class="bangumi-picture no-lightbox">
             <img
                     th:src="${isLazyload ? loadingImg : spec.cover}"
                     th:data-lazy-src="${ isLazyload ? spec.cover : ''}"
diff --git a/templates/macro/content-links.html b/templates/macro/content-links.html
index 0d64252f..0131e867 100644
--- a/templates/macro/content-links.html
+++ b/templates/macro/content-links.html
@@ -101,7 +101,7 @@
 
                         <a class="info cf-friends-link" target="_blank" th:href="${link.spec.url}"
                            th:title="${link.spec.displayName}">
-                            <div class="site-card-avatar">
+                            <div class="site-card-avatar no-lightbox">
                                 <img class="flink-avatar cf-friends-avatar" th:alt="${link.spec.displayName}"
 
                                      th:src="${isLazyload ? loadingImg : link.spec.logo}"
@@ -130,7 +130,7 @@
 
                                  th:src="${isLazyload ? loadingImg : link.spec.logo}"
                                  th:data-lazy-src="${ isLazyload ? link.spec.logo : ''}">
-                            <div class="flink-item-info">
+                            <div class="flink-item-info no-lightbox">
                                 <span class="flink-item-name cf-friends-name" th:text="${link.spec.displayName}"></span>
                                 <span class="flink-item-desc" th:text="${link.spec.description}"
                                       th:title="${link.spec.description}"></span>