Merge pull request #1987 from OpenTechFund/enhancement/move-main-js-to-bottom

Move main.js to bottom and create main-top.js with the bits that need…

Merge pull request #1987 from OpenTechFund/enhancement/move-main-js-to-bottom
f7b1e292 · Fredrik Jonsson · GitHub · afdd8272 · e56da9c0 · f7b1e292
Unverified Commit f7b1e292 authored 4 years ago by Fredrik Jonsson Committed by GitHub 4 years ago
--- a/hypha/static_src/src/javascript/main-top.js
+++ b/hypha/static_src/src/javascript/main-top.js
+(function ($) {
+
+    'use strict';
+
+    // IE 11 does not support classList.replace.
+    // document.querySelector('html').classList.replace('no-js', 'js');
+    $('html').removeClass('no-js').addClass('js');
+
+
+})(jQuery);
--- a/hypha/static_src/src/javascript/main.js
+++ b/hypha/static_src/src/javascript/main.js
@@ -2,10 +2,6 @@

    'use strict';

-    // IE 11 does not support classList.replace.
-    // document.querySelector('html').classList.replace('no-js', 'js');
-    $('html').removeClass('no-js').addClass('js');
-
    let Search = class {
        static selector() {
            return '.js-search-toggle';

--- a/hypha/templates/base-apply.html
+++ b/hypha/templates/base-apply.html
@@ -33,7 +33,7 @@

        <script src="{% static 'js/jquery.min.js' %}"></script>
        <script src="{% static 'js/js.cookie.min.js' %}"></script>
-        <script src="{% static 'js/main.js' %}"></script>
+        <script src="{% static 'js/main-top.js' %}"></script>
    </head>

    <body class="{% block body_class %}light-grey-bg template-{{ page.get_verbose_name|slugify }}{% endblock %}">
@@ -111,6 +111,7 @@
        </main>

        <footer class="footer"></footer>
+        <script src="{% static 'js/main.js' %}"></script>
        {% block extra_js %}{% endblock %}
    </body>
 </html>
--- a/hypha/templates/base.html
+++ b/hypha/templates/base.html
@@ -58,7 +58,7 @@
        <link rel="stylesheet" href="{% static 'css/print.css' %}" media="print">

        <script src="{% static 'js/jquery.min.js' %}"></script>
-        <script src="{% static 'js/main.js' %}"></script>
+        <script src="{% static 'js/main-top.js' %}"></script>
    </head>

    <body class="{% block body_class %}template-{{ page.get_verbose_name|slugify }}{% endblock %}">
@@ -201,6 +201,7 @@
              new google.translate.TranslateElement({pageLanguage: 'en', layout: google.translate.TranslateElement.InlineLayout.SIMPLE, autoDisplay: false}, 'google_translate_element');
            }
        </script>
+        <script src="{% static 'js/main.js' %}"></script>
        {% block extra_js %}{% endblock %}
    </body>
 </html>