Skip to content

Commit ca41c7e

Browse files
committed
chore(deps): use lazysizes to load images
1 parent 7651d28 commit ca41c7e

File tree

10 files changed

+26
-32
lines changed

10 files changed

+26
-32
lines changed

_data/assets/cross_origin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ magnific-popup:
4949
css: https://cdn.jsdelivr.net/npm/magnific-popup@1.1.0/dist/magnific-popup.min.css
5050
js: https://cdn.jsdelivr.net/npm/magnific-popup@1.1.0/dist/jquery.magnific-popup.min.js
5151

52-
lozad:
53-
js: https://cdn.jsdelivr.net/npm/lozad/dist/lozad.min.js
52+
lazysizes:
53+
js: https://cdn.jsdelivr.net/npm/lazysizes@5.3.2/lazysizes.min.js
5454

5555
clipboard:
5656
js: https://cdn.jsdelivr.net/npm/clipboard@2.0.11/dist/clipboard.min.js

_data/assets/self_host.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ magnific-popup:
3838
css: /assets/lib/magnific-popup-1.1.0/magnific-popup.css
3939
js: /assets/lib/magnific-popup-1.1.0/jquery.magnific-popup.min.js
4040

41-
lozad:
42-
js: /assets/lib/lozad-1.16.0/lozad.min.js
41+
lazysizes:
42+
js: /assets/lib/lazysizes-5.3.2/lazysizes.min.js
4343

4444
clipboard:
4545
js: /assets/lib/clipboard-2.0.9/clipboard.min.js

_includes/js-selector.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
{% if page.layout == 'post' or page.layout == 'page' %}
1616
<!-- image lazy-loading & popup & clipboard -->
1717
{% assign _urls = site.data.assets[origin].magnific-popup.js
18-
| append: ',' | append: site.data.assets[origin].lozad.js
18+
| append: ',' | append: site.data.assets[origin].lazysizes.js
1919
| append: ',' | append: site.data.assets[origin].clipboard.js
2020
%}
2121

2222
{% include jsdelivr-combine.html urls=_urls %}
23-
2423
{% endif %}
2524

2625
{% if page.layout == 'home'

_includes/refactor-content.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,14 @@
115115

116116
{% endunless %}
117117

118-
<!-- lazy-load images <https://github.com/ApoorvSaxena/lozad.js#usage> -->
118+
<!-- lazy-load images <https://github.com/aFarkas/lazysizes#readme> -->
119+
120+
{% if _left contains 'class=' %}
121+
{% assign _left = _left | replace: 'class="', 'class="lazyload ' %}
122+
{% else %}
123+
{% assign _left = _left | replace: 'src=', 'class="lazyload" src=' %}
124+
{% endif %}
125+
119126
{% assign _left = _left | replace: 'src=', 'data-src=' %}
120127
121128
{% endif %}

_javascript/utils/img-extra.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/**
2-
Lazy load images (https://github.com/ApoorvSaxena/lozad.js)
3-
and popup when clicked (https://github.com/dimsemenov/Magnific-Popup)
2+
Set up image popup stuff (https://github.com/dimsemenov/Magnific-Popup)
43
*/
54

65
$(function () {
@@ -10,12 +9,6 @@ $(function () {
109
return;
1110
}
1211

13-
/* lazy loading */
14-
15-
const imgList = document.querySelectorAll(`${IMG_SCOPE} img[data-src]`);
16-
const observer = lozad(imgList);
17-
observer.observe();
18-
1912
/* popup */
2013

2114
$(`${IMG_SCOPE} p > img[data-src], ${IMG_SCOPE} img[data-src].preview-img`).each(

_sass/addon/commons.scss

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -183,22 +183,17 @@ i { /* fontawesome icons */
183183
}
184184
}
185185

186-
@-webkit-keyframes fade-in {
187-
from { opacity: 0; }
188-
to { opacity: 1; }
189-
}
190-
191-
@keyframes fade-in {
192-
from { opacity: 0; }
193-
to { opacity: 1; }
194-
}
195-
196186
img[data-src] {
197187
margin: 0.5rem 0;
198188

199-
&[data-loaded="true"] {
200-
-webkit-animation: fade-in linear 0.5s;
201-
animation: fade-in linear 0.5s;
189+
&.lazyload,
190+
&.lazyloading {
191+
opacity: 0;
192+
}
193+
194+
&.lazyloaded {
195+
opacity: 1;
196+
transition: opacity 0.5s;
202197
}
203198

204199
&.left {

_sass/layout/post.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ img.preview-img {
3030
margin: 0;
3131
border-radius: 6px;
3232

33-
&.bg[data-loaded="true"] {
33+
&.bg {
3434
background: var(--preview-img-bg);
3535
}
3636
}

assets/js/dist/page.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)