17.2: minor fixes, shuffle on reset on gti

Author: miermontoto

package.json

@@ -5,32 +5,16 @@ let total;
 let originalQuestions;
 
 window.addEventListener('load', () => { // when the page loads (the content is rendered)
-	resetAll();
+	originalQuestions = document.querySelector('#questions').innerHTML;
 	document.querySelector('#reset').addEventListener('click', resetAll);
 	total = document.querySelectorAll('.question-block').length;
 	document.querySelector('#total').innerHTML = total;
-	originalQuestions = document.querySelector('#questions').innerHTML;
 
 	document.querySelectorAll('#shuffle-questions, #shuffle-answers').forEach((checkbox) => {
-		checkbox.addEventListener('change', () => {
-			document.querySelector('#questions').innerHTML = originalQuestions;
-
-			if (document.querySelector('#shuffle-questions').checked) {
-				shuffleQuestions();
-			}
-
-			if (document.querySelector('#shuffle-answers').checked) {
-				shuffleAnswers();
-			}
-
-			resetAll();
-			recalc();
-		});
+		checkbox.addEventListener('change', resetAll);
 	});
 
-	shuffleQuestions();
-	shuffleAnswers();
-	recalc();
+	resetAll();
 });
 
 window.addEventListener('scroll', () => {
@@ -120,6 +104,18 @@ function round(number) {
 }
 
 function resetAll() {
+	document.querySelector('#questions').innerHTML = originalQuestions;
+
+	if (document.querySelector('#shuffle-questions').checked) {
+		shuffleQuestions();
+	}
+
+	if (document.querySelector('#shuffle-answers').checked) {
+		shuffleAnswers();
+	}
+
+	recalc();
+
 	document.querySelectorAll('.question-block').forEach((block) => {
 		block.classList.remove('correct');
 		block.classList.remove('wrong');

src/static/js/app/gti.js

@@ -9,11 +9,9 @@ css: project
     <a href="{{ source }}" id="source">source code ></a>
 {% endif %}
 <h1>{{ title }}</h1>
-{% if buttons %}
-    {% for button in buttons %}
-        {{ button | safe }}
-    {% endfor %}
-{% endif %}
+{% for button in buttons %}
+    {{ button | safe }}
+{% endfor %}
 <hr>
 {% if content %}
     {{ content | safe }}