Skip to content

Commit c283e77

Browse files
cotes2020cotes2020
committedMay 12, 2023
refactor!: rename assets origin configuration files
1 parent 9d97120 commit c283e77

File tree

7 files changed

+33
-33
lines changed

7 files changed

+33
-33
lines changed
 

‎_data/assets/self_host.yml ‎_data/origin/basic.yml

File renamed without changes.

‎_data/assets/cross_origin.yml ‎_data/origin/cors.yml

File renamed without changes.

‎_includes/head.html

+7-8
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@
5858
{% include favicons.html %}
5959

6060
{% if site.resources.ignore_env != jekyll.environment and site.resources.self_hosted %}
61-
<link href="{{ site.data.assets[origin].webfonts | relative_url }}" rel="stylesheet">
61+
<link href="{{ site.data.origin[type].webfonts | relative_url }}" rel="stylesheet">
6262

6363
{% else %}
64-
{% for cdn in site.data.assets[origin].cdns %}
64+
{% for cdn in site.data.origin[type].cdns %}
6565
<link rel="preconnect" href="{{ cdn.url }}" {{ cdn.args }}>
6666
<link rel="dns-prefetch" href="{{ cdn.url }}" {{ cdn.args }}>
6767
{% endfor %}
6868

69-
<link rel="stylesheet" href="{{ site.data.assets[origin].webfonts | relative_url }}">
69+
<link rel="stylesheet" href="{{ site.data.origin[type].webfonts | relative_url }}">
7070
{% endif %}
7171

7272
<!-- GA -->
@@ -90,20 +90,20 @@
9090
{% endif %}
9191

9292
<!-- Bootstrap -->
93-
<link rel="stylesheet" href="{{ site.data.assets[origin].bootstrap.css | relative_url}}">
93+
<link rel="stylesheet" href="{{ site.data.origin[type].bootstrap.css | relative_url}}">
9494

9595
<!-- Font Awesome -->
96-
<link rel="stylesheet" href="{{ site.data.assets[origin].fontawesome.css | relative_url }}">
96+
<link rel="stylesheet" href="{{ site.data.origin[type].fontawesome.css | relative_url }}">
9797

9898
<link rel="stylesheet" href="{{ '/assets/css/style.css' | relative_url }}">
9999

100100
{% if site.toc and page.toc %}
101-
<link rel="stylesheet" href="{{ site.data.assets[origin].toc.css | relative_url }}">
101+
<link rel="stylesheet" href="{{ site.data.origin[type].toc.css | relative_url }}">
102102
{% endif %}
103103

104104
{% if page.layout == 'page' or page.layout == 'post' %}
105105
<!-- Manific Popup -->
106-
<link rel="stylesheet" href="{{ site.data.assets[origin].magnific-popup.css | relative_url }}">
106+
<link rel="stylesheet" href="{{ site.data.origin[type].magnific-popup.css | relative_url }}">
107107
{% endif %}
108108

109109
<!-- JavaScript -->
@@ -113,5 +113,4 @@
113113
{% endunless %}
114114

115115
{% include metadata-hook.html %}
116-
117116
</head>

‎_includes/js-selector.html

+19-19
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@
22

33
<!-- commons -->
44

5-
{% assign urls = site.data.assets[origin].jquery.js
5+
{% assign urls = site.data.origin[type].jquery.js
66
| append: ','
7-
| append: site.data.assets[origin].bootstrap.js
7+
| append: site.data.origin[type].bootstrap.js
88
| append: ','
9-
| append: site.data.assets[origin].search.js
9+
| append: site.data.origin[type].search.js
1010
%}
1111

1212
<!-- layout specified -->
1313

1414
{% if page.layout == 'post' %}
1515
{% if site.google_analytics.pv.proxy_endpoint or site.google_analytics.pv.cache_path %}
1616
<!-- pv-report needs countup.js -->
17-
{% assign urls = urls | append: ',' | append: site.data.assets[origin].countup.js %}
17+
{% assign urls = urls | append: ',' | append: site.data.origin[type].countup.js %}
1818
{% endif %}
1919
{% endif %}
2020

2121
{% if page.layout == 'post' or page.layout == 'page' or page.layout == 'home' %}
22-
{% assign urls = urls | append: ',' | append: site.data.assets[origin].lazysizes.js %}
22+
{% assign urls = urls | append: ',' | append: site.data.origin[type].lazysizes.js %}
2323

2424
{% unless page.layout == 'home' %}
2525
<!-- image lazy-loading & popup & clipboard -->
2626
{% assign urls = urls
2727
| append: ','
28-
| append: site.data.assets[origin]['magnific-popup'].js
28+
| append: site.data.origin[type]['magnific-popup'].js
2929
| append: ','
30-
| append: site.data.assets[origin].clipboard.js
30+
| append: site.data.origin[type].clipboard.js
3131
%}
3232
{% endunless %}
3333
{% endif %}
@@ -42,37 +42,37 @@
4242

4343
{% assign urls = urls
4444
| append: ','
45-
| append: site.data.assets[origin].dayjs.js.common
45+
| append: site.data.origin[type].dayjs.js.common
4646
| append: ','
47-
| append: site.data.assets[origin].dayjs.js.locale
47+
| append: site.data.origin[type].dayjs.js.locale
4848
| replace: ':LOCALE', locale
4949
| append: ','
50-
| append: site.data.assets[origin].dayjs.js.relativeTime
50+
| append: site.data.origin[type].dayjs.js.relativeTime
5151
| append: ','
52-
| append: site.data.assets[origin].dayjs.js.localizedFormat
52+
| append: site.data.origin[type].dayjs.js.localizedFormat
5353
%}
5454
{% endif %}
5555

5656
{% if page.content contains '<h2' or page.content contains '<h3' and site.toc and page.toc %}
57-
{% assign urls = urls | append: ',' | append: site.data.assets[origin].toc.js %}
57+
{% assign urls = urls | append: ',' | append: site.data.origin[type].toc.js %}
5858
{% endif %}
5959

6060
{% if page.mermaid %}
61-
{% assign urls = urls | append: ',' | append: site.data.assets[origin].mermaid.js %}
61+
{% assign urls = urls | append: ',' | append: site.data.origin[type].mermaid.js %}
6262
{% endif %}
6363

6464
{% include jsdelivr-combine.html urls=urls %}
6565

6666
{% case page.layout %}
6767
{% when 'home', 'categories', 'post', 'page' %}
68-
{% assign type = page.layout %}
68+
{% assign js = page.layout %}
6969
{% when 'archives', 'category', 'tag' %}
70-
{% assign type = 'misc' %}
70+
{% assign js = 'misc' %}
7171
{% else %}
72-
{% assign type = 'commons' %}
72+
{% assign js = 'commons' %}
7373
{% endcase %}
7474

75-
{% capture script %}/assets/js/dist/{{ type }}.min.js{% endcapture %}
75+
{% capture script %}/assets/js/dist/{{ js }}.min.js{% endcapture %}
7676
<script defer src="{{ script | relative_url }}"></script>
7777

7878
{% if page.math %}
@@ -94,8 +94,8 @@
9494
}
9595
};
9696
</script>
97-
<script src="{{ site.data.assets[origin].polyfill.js | relative_url }}"></script>
98-
<script id="MathJax-script" async src="{{ site.data.assets[origin].mathjax.js | relative_url }}"></script>
97+
<script src="{{ site.data.origin[type].polyfill.js | relative_url }}"></script>
98+
<script id="MathJax-script" async src="{{ site.data.origin[type].mathjax.js | relative_url }}"></script>
9999
{% endif %}
100100

101101
{% if jekyll.environment == 'production' %}

‎_includes/assets-origin.html ‎_includes/origin-type.html

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
{% comment %} Site static assets origin {% endcomment %}
2-
{% assign origin = 'cross_origin' %}
1+
{% comment %} Site static assets origin type {% endcomment %}
2+
3+
{% assign type = 'cors' %}
34

45
{% if site.assets.self_host.enabled %}
56
{% if site.assets.self_host.env %}
67
{% if site.assets.self_host.env == jekyll.environment %}
7-
{% assign origin = 'self_host' %}
8+
{% assign type = 'basic' %}
89
{% endif %}
910
{% else %}
10-
{% assign origin = 'self_host' %}
11+
{% assign type = 'basic' %}
1112
{% endif %}
1213
{% endif %}

‎_layouts/default.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<!doctype html>
77

8-
{% include assets-origin.html %}
8+
{% include origin-type.html %}
99

1010
{% include lang.html %}
1111

‎_layouts/page.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
---
44

55
{% include lang.html %}
6-
{% include assets-origin.html %}
6+
{% include origin-type.html %}
77

88
<div class="row">
99
<!-- core -->

0 commit comments

Comments
 (0)
Please sign in to comment.