Skip to content

Commit dacac74

Browse files
alshedivatalshedivat
committed
Fix issues with loading scripts (alshedivat#117)
1 parent adfbe18 commit dacac74

File tree

10 files changed

+71
-68
lines changed

10 files changed

+71
-68
lines changed

‎_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ fontawesome:
168168
integrity: "sha512-1PKOgIY59xJ8Co8+NE6FZ+LOAZKjy+KY8iq0G4B3CyeY6wYHN3yt9PW0XpSriVlkMXe40PTKnXrLnZ9+fkDaog=="
169169
jquery:
170170
version: "3.5.1"
171-
integrity: "sha512-/DXTXr6nQodMUiq+IUJYCt2PPOUjrHJ9wFrqpJ3XkgPNOZVfMok7cRw6CSxyCQxXn6ozlESsSh1/sMCTF1rL/g=="
171+
integrity: "sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg=="
172172
mathjax:
173173
version: "3.1.2"
174174
mansory:

‎_includes/head.html‎

Lines changed: 12 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,6 @@
55
<title>{% if site.title == blank %}{{ site.title }}{% else %}{{ site.first_name }} {{ site.middle_name }} {{ site.last_name }}{% endif %}{% if page.title and page.url != "/" %} | {{ page.title }}{% endif %}</title>
66
<meta name="description" content="{{ site.description }}">
77

8-
<!-- Bootstrap & MDB -->
9-
<link href="https://stackpath.bootstrapcdn.com/bootstrap/{{ site.bootstrap.version }}/css/bootstrap.min.css" rel="stylesheet" integrity="{{ site.bootstrap.integrity.css }}" crossorigin="anonymous">
10-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/{{ site.mdb.version }}/css/mdb.min.css" integrity="{{ site.mdb.integrity.css }}" crossorigin="anonymous" />
11-
<script defer src="https://code.jquery.com/jquery-{{ site.jquery.version }}.slim.min.js" integrity="{{ site.jquery.integrity }}" crossorigin="anonymous"></script>
12-
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/{{ site.popper.version }}/umd/popper.min.js" integrity="{{ site.popper.integrity }}" crossorigin="anonymous"></script>
13-
<script defer src="https://stackpath.bootstrapcdn.com/bootstrap/{{ site.bootstrap.version }}/js/bootstrap.min.js" integrity="{{ site.bootstrap.integrity.js }}" crossorigin="anonymous"></script>
14-
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/{{ site.mdb.version }}/js/mdb.min.js" integrity="{{ site.mdb.integrity.js }}" crossorigin="anonymous"></script>
15-
16-
<!-- Fonts & Icons -->
17-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/{{ site.fontawesome.version }}/css/all.min.css" integrity="{{ site.fontawesome.integrity }}" crossorigin="anonymous">
18-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/academicons/{{ site.academicons.version }}/css/academicons.min.css" integrity="{{ site.academicons.integrity }}" crossorigin="anonymous">
19-
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Roboto+Slab:100,300,400,500,700|Material+Icons">
20-
21-
<!-- Styles -->
22-
<link rel="shortcut icon" href="{{ '/assets/img/favicon.ico' | relative_url }}">
23-
<link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
24-
25-
<link rel="canonical" href="{{ page.url | replace:'index.html','' | relative_url }}">
26-
278
<!-- Open Graph -->
289
{% if site.serve_og_meta %}
2910
<meta property="og:site_name" content="{{ site.description }}" />
@@ -34,56 +15,20 @@
3415
<meta property="og:image" content="{%- if page.og_image -%}{{ page.og_image }}{%- else -%}{{ site.og_image }}{%- endif -%}" />
3516
{% endif %}
3617

37-
<!-- Load Common JS -->
38-
<script defer src="{{ '/assets/js/common.js' | relative_url }}"></script>
18+
<!-- Bootstrap & MDB -->
19+
<link href="https://stackpath.bootstrapcdn.com/bootstrap/{{ site.bootstrap.version }}/css/bootstrap.min.css" rel="stylesheet" integrity="{{ site.bootstrap.integrity.css }}" crossorigin="anonymous">
20+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/{{ site.mdb.version }}/css/mdb.min.css" integrity="{{ site.mdb.integrity.css }}" crossorigin="anonymous" />
21+
22+
<!-- Fonts & Icons -->
23+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/{{ site.fontawesome.version }}/css/all.min.css" integrity="{{ site.fontawesome.integrity }}" crossorigin="anonymous">
24+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/academicons/{{ site.academicons.version }}/css/academicons.min.css" integrity="{{ site.academicons.integrity }}" crossorigin="anonymous">
25+
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Roboto+Slab:100,300,400,500,700|Material+Icons">
3926

4027
<!-- Code Syntax Highlighting -->
4128
<link rel="stylesheet" href="https://gitcdn.link/repo/jwarby/jekyll-pygments-themes/master/{{ site.highlight_theme }}.css" />
4229

43-
{% if site.enable_math %}
44-
<!-- Load MathJax -->
45-
<script defer type="text/javascript" id="MathJax-script" src="https://cdn.jsdelivr.net/npm/mathjax@{{ site.mathjax.version }}/es5/tex-mml-chtml.js"></script>
46-
<script defer src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
47-
{% endif %}
48-
49-
{% if site.enable_mansory %}
50-
<!-- Load Mansory & imagesLoaded -->
51-
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/masonry/{{ site.mansory.version }}/masonry.pkgd.min.js" integrity="{{ site.masonry.integrity }}" crossorigin="anonymous"></script>
52-
<script defer src="https://unpkg.com/imagesloaded@4/imagesloaded.pkgd.min.js"></script>
53-
54-
<!-- Project Cards Layout -->
55-
<script defer type="text/javascript">
56-
// Init Masonry
57-
var $grid = $('.grid').masonry({
58-
gutter: 10,
59-
horizontalOrder: true,
60-
itemSelector: '.grid-item',
61-
});
62-
// layout Masonry after each image loads
63-
$grid.imagesLoaded().progress( function() {
64-
$grid.masonry('layout');
65-
});
66-
</script>
67-
{% endif %}
68-
69-
{% if site.enable_tooltips %}
70-
<!-- Enable Tooltips -->
71-
<script defer type="text/javascript">
72-
$(function () {
73-
$('[data-toggle="tooltip"]').tooltip()
74-
})
75-
</script>
76-
{% endif %}
77-
78-
{% if site.enable_google_analytics %}
79-
<!-- Google Analytics -->
80-
<script defer>
81-
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
82-
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
83-
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
84-
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
30+
<!-- Styles -->
31+
<link rel="shortcut icon" href="{{ '/assets/img/favicon.ico' | relative_url }}">
32+
<link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
8533

86-
ga('create', '{{ site.google_analytics }}', 'auto');
87-
ga('send', 'pageview');
88-
</script>
89-
{% endif %}
34+
<link rel="canonical" href="{{ page.url | replace:'index.html','' | relative_url }}">

‎_includes/scripts/bootstrap.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<!-- Bootsrap & MDB scripts -->
2+
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/{{ site.popper.version }}/umd/popper.min.js" integrity="{{ site.popper.integrity }}" crossorigin="anonymous"></script>
3+
<script src="https://stackpath.bootstrapcdn.com/bootstrap/{{ site.bootstrap.version }}/js/bootstrap.min.js" integrity="{{ site.bootstrap.integrity.js }}" crossorigin="anonymous"></script>
4+
<script src="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/{{ site.mdb.version }}/js/mdb.min.js" integrity="{{ site.mdb.integrity.js }}" crossorigin="anonymous"></script>

‎_includes/scripts/jquery.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<!-- jQuery -->
2+
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/{{ site.jquery.version }}/jquery.min.js" integrity="{{ site.jquery.integrity }}" crossorigin="anonymous"></script>

‎_includes/scripts/mansory.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{% if site.enable_mansory %}
2+
<!-- Mansory & imagesLoaded -->
3+
<script defer src="https://unpkg.com/masonry-layout@4/dist/masonry.pkgd.min.js"></script>
4+
<script defer src="https://unpkg.com/imagesloaded@4/imagesloaded.pkgd.min.js"></script>
5+
<script defer src="{{ '/assets/js/mansory.js' | relative_url }}" type="text/javascript"></script>
6+
{% endif %}

‎_includes/scripts/mathjax.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{% if site.enable_math %}
2+
<!-- MathJax -->
3+
<script defer type="text/javascript" id="MathJax-script" src="https://cdn.jsdelivr.net/npm/mathjax@{{ site.mathjax.version }}/es5/tex-mml-chtml.js"></script>
4+
<script defer src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
5+
{% endif %}

‎_includes/scripts/misc.html‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{% if site.enable_tooltips %}
2+
<!-- Enable Tooltips -->
3+
<script type="text/javascript">
4+
$(function () {$('[data-toggle="tooltip"]').tooltip()})
5+
</script>
6+
{% endif %}
7+
8+
{% if site.enable_google_analytics %}
9+
<!-- Google Analytics -->
10+
<script>
11+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
12+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
13+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
14+
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
15+
16+
ga('create', '{{ site.google_analytics }}', 'auto');
17+
ga('send', 'pageview');
18+
</script>
19+
{% endif %}
20+
21+
<!-- Load Common JS -->
22+
<script src="{{ '/assets/js/common.js' | relative_url }}"></script>

‎_layouts/default.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<head>
55
{% include head.html %}
6+
{% include scripts/mathjax.html %}
67
</head>
78

89
<body class="{% if site.navbar_fixed %}fixed-top-nav{% endif %} {% unless site.footer_fixed %}sticky-bottom-footer{% endunless %}">
@@ -23,4 +24,9 @@
2324

2425
</body>
2526

27+
{% include scripts/jquery.html %}
28+
{% include scripts/bootstrap.html %}
29+
{% include scripts/mansory.html %}
30+
{% include scripts/misc.html %}
31+
2632
</html>

‎_layouts/distill.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<html>
33
<head>
44
{% include head.html %}
5+
{% include scripts/mathjax.html %}
56
<script src="{{ '/assets/js/distillpub/template.v2.js' | relative_url }}"></script>
67
<script src="{{ '/assets/js/distillpub/transforms.v2.js' | relative_url }}"></script>
78
{% if page._styles %}

‎assets/js/mansory.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
$(document).ready(function() {
2+
// Init Masonry
3+
var $grid = $('.grid').masonry({
4+
gutter: 10,
5+
horizontalOrder: true,
6+
itemSelector: '.grid-item',
7+
});
8+
// Layout Masonry after each image loads
9+
$grid.imagesLoaded().progress( function() {
10+
$grid.masonry('layout');
11+
});
12+
});

0 commit comments

Comments
 (0)