Fix templates: remove JS errors

Fix #403.
PnX-SI · Dec 7, 2023 · 4beebfe · 4beebfe
1 parent 5a918b1
commit 4beebfe
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 16 deletions.
diff --git a/atlas/static/custom/templates/footer.html.sample b/atlas/static/custom/templates/footer.html.sample
@@ -69,16 +69,3 @@
         ga('send', 'pageview');
     </script>
 {% endif %}
-
-<script>
-    var prevScrollpos = window.pageYOffset;
-    window.onscroll = function () {
-        var currentScrollPos = window.pageYOffset;
-        if (prevScrollpos > currentScrollPos) {
-            document.getElementById("collapseFooter").style.top = "-100px";
-        } else {
-            document.getElementById("collapseFooter").style.top = "0px";
-        }
-        prevScrollpos = currentScrollPos;
-    }
-</script>
diff --git a/atlas/templates/home/_main.html b/atlas/templates/home/_main.html
@@ -13,9 +13,11 @@
             url_limit_territory = "{{url_for('static', filename='custom/territoire.json') }}";
     </script>
     <script src="{{ url_for('static', filename='main.js') }}"></script>
-    <script src="{{ url_for('static', filename='custom/maps-custom.js') }}"></script>
-    <script src="{{ url_for('static', filename='mapGenerator.js') }}"></script>
-    <script src="{{ url_for('static', filename='mapHome.js') }}"></script>
+    {% if configuration.AFFICHAGE_DERNIERES_OBS %}
+        <script src="{{ url_for('static', filename='custom/maps-custom.js') }}"></script>
+        <script src="{{ url_for('static', filename='mapGenerator.js') }}"></script>
+        <script src="{{ url_for('static', filename='mapHome.js') }}"></script>
+    {% endif %}
     <script src="{{ url_for('static', filename='main.js') }}"></script>
     <script>
         // load lazy the images

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -2,6 +2,41 @@
 CHANGELOG
 =========
 
+1.6.2 (?)
+---------
+
+🐛 **Corrections**
+
+⚠️ **Notes de version**
+
+Si vous mettez à jour GeoNature-atlas :
+
+- Vous pouvez passer directement à cette version, mais en suivant les notes de versions intermédiaires
+- Si vous avez l'erreur suivante sur la page d'accueil après avoir scrollé sur la page :
+
+    ::
+
+        (index):1041 Uncaught TypeError: Cannot read properties of null (reading 'style')
+        at window.onscroll ((index):1041:54)
+
+  - Supprimer dans votre fichier ``atlas/static/custom/templates/footer.html`` le code situé à la fin suivant :
+
+    ::
+
+        <script>
+            var prevScrollpos = window.pageYOffset;
+            window.onscroll = function () {
+                var currentScrollPos = window.pageYOffset;
+                if (prevScrollpos > currentScrollPos) {
+                    document.getElementById("collapseFooter").style.top = "-100px";
+                } else {
+                    document.getElementById("collapseFooter").style.top = "0px";
+                }
+                prevScrollpos = currentScrollPos;
+            }
+        </script>
+
+
 1.6.1 (2023-10-16)
 ------------------