bootstap4-jinja, bootblog4-jinja: do not load moment or fancy-dates i…

…f fanciness is not requested (generated from the mako templates by scripts/jinjify)
getnikola · Feb 19, 2019 · 8a1829d · 8a1829d
1 parent 815193e
commit 8a1829d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 17 deletions.
diff --git a/nikola/data/themes/bootblog4-jinja/templates/base.tmpl b/nikola/data/themes/bootblog4-jinja/templates/base.tmpl
@@ -82,12 +82,14 @@
 </div>
 
 {{ base.late_load_js() }}
-    <!-- fancy dates -->
-    <script>
-    moment.locale("{{ momentjs_locales[lang] }}");
-    fancydates({{ date_fanciness }}, {{ js_date_format }});
-    </script>
-    <!-- end fancy dates -->
+    {% if date_fanciness != 0 %}
+        <!-- fancy dates -->
+        <script>
+        moment.locale("{{ momentjs_locales[lang] }}");
+        fancydates({{ date_fanciness }}, {{ js_date_format }});
+        </script>
+        <!-- end fancy dates -->
+    {% endif %}
     {% block extra_js %}{% endblock %}
     <script>
     baguetteBox.run('div#content', {

diff --git a/nikola/data/themes/bootblog4-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootblog4-jinja/templates/base_helper.tmpl
@@ -68,7 +68,9 @@ lang="{{ lang }}">
         <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha256-ZvOgfh+ptkpoa2Y4HkRY28ir89u/+VRyDE7sB7hEEcI=" crossorigin="anonymous"></script>
         <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.11.0/baguetteBox.min.js" integrity="sha256-yQGjQhFs3LtyiN5hhr3k9s9TWZOh/RzCkD3gwwCKlkg=" crossorigin="anonymous"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment-with-locales.min.js" integrity="sha256-AdQN98MVZs44Eq2yTwtoKufhnU+uZ7v2kXnD5vqzZVo=" crossorigin="anonymous"></script>
+        {% if date_fanciness != 0 %}
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment-with-locales.min.js" integrity="sha256-AdQN98MVZs44Eq2yTwtoKufhnU+uZ7v2kXnD5vqzZVo=" crossorigin="anonymous"></script>
+        {% endif %}
     {% endif %}
     {% if use_bundles and use_cdn %}
         <script src="/assets/js/all.js"></script>
@@ -80,9 +82,13 @@ lang="{{ lang }}">
             <script src="/assets/js/popper.min.js"></script>
             <script src="/assets/js/bootstrap.min.js"></script>
             <script src="/assets/js/baguetteBox.min.js"></script>
-            <script src="/assets/js/moment-with-locales.min.js"></script>
+            {% if date_fanciness != 0 %}
+                <script src="/assets/js/moment-with-locales.min.js"></script>
+            {% endif %}
+        {% endif %}
+        {% if date_fanciness != 0 %}
+            <script src="/assets/js/fancydates.min.js"></script>
         {% endif %}
-        <script src="/assets/js/fancydates.min.js"></script>
     {% endif %}
     {{ social_buttons_code }}
 {% endmacro %}

diff --git a/nikola/data/themes/bootstrap4-jinja/templates/base.tmpl b/nikola/data/themes/bootstrap4-jinja/templates/base.tmpl
@@ -76,12 +76,14 @@ navbar-dark bg-dark
 </div>
 
 {{ base.late_load_js() }}
-    <!-- fancy dates -->
-    <script>
-    moment.locale("{{ momentjs_locales[lang] }}");
-    fancydates({{ date_fanciness }}, {{ js_date_format }});
-    </script>
-    <!-- end fancy dates -->
+    {% if date_fanciness != 0 %}
+        <!-- fancy dates -->
+        <script>
+        moment.locale("{{ momentjs_locales[lang] }}");
+        fancydates({{ date_fanciness }}, {{ js_date_format }});
+        </script>
+        <!-- end fancy dates -->
+    {% endif %}
     {% block extra_js %}{% endblock %}
     <script>
     baguetteBox.run('div#content', {

diff --git a/nikola/data/themes/bootstrap4-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap4-jinja/templates/base_helper.tmpl
@@ -67,7 +67,9 @@ lang="{{ lang }}">
         <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha256-ZvOgfh+ptkpoa2Y4HkRY28ir89u/+VRyDE7sB7hEEcI=" crossorigin="anonymous"></script>
         <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.11.0/baguetteBox.min.js" integrity="sha256-yQGjQhFs3LtyiN5hhr3k9s9TWZOh/RzCkD3gwwCKlkg=" crossorigin="anonymous"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment-with-locales.min.js" integrity="sha256-AdQN98MVZs44Eq2yTwtoKufhnU+uZ7v2kXnD5vqzZVo=" crossorigin="anonymous"></script>
+        {% if date_fanciness != 0 %}
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment-with-locales.min.js" integrity="sha256-AdQN98MVZs44Eq2yTwtoKufhnU+uZ7v2kXnD5vqzZVo=" crossorigin="anonymous"></script>
+        {% endif %}
     {% endif %}
     {% if use_bundles and use_cdn %}
         <script src="/assets/js/all.js"></script>
@@ -79,7 +81,11 @@ lang="{{ lang }}">
             <script src="/assets/js/popper.min.js"></script>
             <script src="/assets/js/bootstrap.min.js"></script>
             <script src="/assets/js/baguetteBox.min.js"></script>
-            <script src="/assets/js/moment-with-locales.min.js"></script>
+            {% if date_fanciness != 0 %}
+                <script src="/assets/js/moment-with-locales.min.js"></script>
+            {% endif %}
+        {% endif %}
+        {% if date_fanciness != 0 %}
             <script src="/assets/js/fancydates.min.js"></script>
         {% endif %}
     {% endif %}