Testing the back button

privacybydesign · Feb 3, 2025 · 9ea17f8 · 9ea17f8
1 parent 6210d03
commit 9ea17f8
Showing 1 changed file with 27 additions and 19 deletions.
diff --git a/webapp/common.js b/webapp/common.js
@@ -19,13 +19,13 @@ function init() {
         $('#email-form input').prop('disabled', false);
     }
 }
-const appNavigationHistory = []; // Track in-app navigation
+let hasSubmitted = false;
 
-function setWindow(window, back = false) {
+function setWindow(window, back) {
     $('[id^=window-]').addClass('hidden');
-    $('#window-' + window).removeClass('hidden');
+    $('#window-'+window).removeClass('hidden');
 
-    const h1 = $('#window-' + window + ' h1');
+    const h1 = $('#window-'+window + ' h1');
     if (isInApp) {
         $('header').hide();
         h1.show();
@@ -37,33 +37,41 @@ function setWindow(window, back = false) {
     const backButton = $('#back-button');
     backButton.off();
 
-    if (!back) {
-        if (appNavigationHistory.length === 0 || appNavigationHistory[appNavigationHistory.length - 1] !== window) {
-            appNavigationHistory.push(window);
-        }
-    }
-
-    if (appNavigationHistory.length > 1) {
+    if (window === '2' && hasSubmitted) {
+        backButton
+            .click(() => {
+                clearStatus();
+                setWindow('1');
+                return false;
+            })
+            .removeClass('button-hidden');
+    } else if (window === '3' && hasSubmitted) {
         backButton
             .click(() => {
                 clearStatus();
-                appNavigationHistory.pop(); 
-                const previousPage = appNavigationHistory[appNavigationHistory.length - 1];
-                setWindow(previousPage, true); 
+                setWindow('2');
                 return false;
             })
             .removeClass('button-hidden');
     } else {
-        backButton.addClass('button-hidden'); 
+        backButton.addClass('button-hidden');
     }
 
     const submitButtonText = MESSAGES['submit-' + window];
     const submitButton = $('#submit-button');
-    if (submitButtonText) {
-        submitButton.text(submitButtonText);
-        submitButton.removeClass('hidden');
-    } else {
+
+    if (window === '3') {
         submitButton.addClass('hidden');
+    } else {
+        submitButton
+            .text(submitButtonText)
+            .removeClass('hidden')
+            .off()
+            .click(() => {
+                hasSubmitted = true;
+                setWindow((parseInt(window) + 1).toString());
+                return false;
+            });
     }
 }