feat(layout): let plugin decide the script placement

ppoffice · Jul 27, 2018 · 63bdd0d · 63bdd0d · ppoffice · Jul 27, 2018
1 parent 9c084f3
commit 63bdd0d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/layout/common/head.ejs b/layout/common/head.ejs
@@ -35,3 +35,9 @@
 <%- css('css/style') %>
 
 <script defer src="//use.fontawesome.com/releases/v5.0.8/js/all.js"></script>
+
+<% if (has_config('plugins')) { %>
+    <% for (let plugin in get_config('plugins')) { %>
+    <%- partial('plugins/' + plugin, {head: true}) %>
+    <% } %>
+<% } %>
diff --git a/layout/common/scripts.ejs b/layout/common/scripts.ejs
@@ -28,7 +28,7 @@
 
 <% if (has_config('plugins')) { %>
     <% for (let plugin in get_config('plugins')) { %>
-    <%- partial('plugins/' + plugin) %>
+    <%- partial('plugins/' + plugin, {head: false}) %>
     <% } %>
 <% } %>
 

diff --git a/layout/plugins/gallery.ejs b/layout/plugins/gallery.ejs
@@ -1,4 +1,4 @@
-<% if (!(has_config('plugins.gallery') && get_config('plugins.gallery') === false)) { %>
+<% if (!head && !(has_config('plugins.gallery') && get_config('plugins.gallery') === false)) { %>
 <script src="//cdnjs.cloudflare.com/ajax/libs/lightgallery/1.6.8/js/lightgallery-all.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/justifiedGallery/3.6.5/js/jquery.justifiedGallery.min.js"></script>
 <script>

diff --git a/layout/plugins/google-analytics.ejs b/layout/plugins/google-analytics.ejs
@@ -1,4 +1,4 @@
-<% if (has_config('plugins.google-analytics.tracking_id')) { %>
+<% if (head && has_config('plugins.google-analytics.tracking_id')) { %>
 <script async src="https://www.googletagmanager.com/gtag/js?id=<%= get_config('plugins.google-analytics.tracking_id') %>"></script>
 <script>
     window.dataLayer = window.dataLayer || [];

diff --git a/layout/plugins/mathjax.ejs b/layout/plugins/mathjax.ejs
@@ -1,4 +1,4 @@
-<% if (!(has_config('plugins.mathjax') && get_config('plugins.mathjax') === false)) { %>
+<% if (!head && !(has_config('plugins.mathjax') && get_config('plugins.mathjax') === false)) { %>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-MML-AM_CHTML"></script>
 <script>
     MathJax.Hub.Config({