Put baguetteBox in late_load_js in base theme

cc @ralsina Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Jan 1, 2018 · d13b184 · d13b184
1 parent 5c7d47f
commit d13b184
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 10 deletions.
diff --git a/nikola/data/themes/base-jinja/templates/base.tmpl b/nikola/data/themes/base-jinja/templates/base.tmpl
@@ -20,11 +20,6 @@
          {{ footer.html_footer() }}
     </div>
     {{ base.late_load_js() }}
-    {% if use_cdn %}
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.js"></script>
-    {% else %}
-        <script src="/assets/js/baguetteBox.min.js"></script>
-    {% endif %}
     {% block extra_js %}{% endblock %}
     <script>
     baguetteBox.run('a.reference:not(.islink)', {

diff --git a/nikola/data/themes/base-jinja/templates/base_helper.tmpl b/nikola/data/themes/base-jinja/templates/base_helper.tmpl
@@ -72,6 +72,19 @@ lang="{{ lang }}">
 {% endmacro %}
 
 {% macro late_load_js() %}
+    {% if use_bundles %}
+        {% if use_cdn %}
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.js"></script>
+        {% else %}
+            <script src="/assets/js/all-nocdn.js"></script>
+        {% endif %}
+    {% else %}
+        {% if use_cdn %}
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.js"></script>
+        {% else %}
+            <script src="/assets/js/baguetteBox.min.js"></script>
+        {% endif %}
+    {% endif %}
     {{ social_buttons_code }}
 {% endmacro %}
 

diff --git a/nikola/data/themes/base/bundles b/nikola/data/themes/base/bundles
@@ -1,2 +1,3 @@
 assets/css/all.css=rst_base.css,nikola_rst.css,code.css,theme.css
 assets/css/all-nocdn.css=rst_base.css,nikola_rst.css,code.css,theme.css,baguetteBox.min.css
+assets/css/all-nocdn.js=baguetteBox.min.js
diff --git a/nikola/data/themes/base/templates/base.tmpl b/nikola/data/themes/base/templates/base.tmpl
@@ -20,11 +20,6 @@ ${template_hooks['extra_head']()}
          ${footer.html_footer()}
     </div>
     ${base.late_load_js()}
-    % if use_cdn:
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.js"></script>
-    % else:
-        <script src="/assets/js/baguetteBox.min.js"></script>
-    % endif
     <%block name="extra_js"></%block>
     <script>
     baguetteBox.run('a.reference:not(.islink)', {

diff --git a/nikola/data/themes/base/templates/base_helper.tmpl b/nikola/data/themes/base/templates/base_helper.tmpl
@@ -72,6 +72,19 @@ lang="${lang}">
 </%def>
 
 <%def name="late_load_js()">
+    % if use_bundles:
+        % if use_cdn:
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.js"></script>
+        % else:
+            <script src="/assets/js/all-nocdn.js"></script>
+        % endif
+    % else:
+        % if use_cdn:
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.js"></script>
+        % else:
+            <script src="/assets/js/baguetteBox.min.js"></script>
+        % endif
+    % endif
     ${social_buttons_code}
 </%def>