From 6210d03157d7333c6c6a49ff0939fbf7efd986a4 Mon Sep 17 00:00:00 2001 From: saravahdatipour Date: Mon, 3 Feb 2025 09:24:24 +0100 Subject: [PATCH] Testing the back button --- webapp/common.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/webapp/common.js b/webapp/common.js index 560c710..0bf8467 100644 --- a/webapp/common.js +++ b/webapp/common.js @@ -21,7 +21,7 @@ function init() { } const appNavigationHistory = []; // Track in-app navigation -function setWindow(window, back) { +function setWindow(window, back = false) { $('[id^=window-]').addClass('hidden'); $('#window-' + window).removeClass('hidden'); @@ -45,16 +45,16 @@ function setWindow(window, back) { if (appNavigationHistory.length > 1) { backButton - .click(() => { - clearStatus(); - appNavigationHistory.pop(); // Remove current page - const previousPage = appNavigationHistory[appNavigationHistory.length - 1]; // Get last page - setWindow(previousPage, false); // Go back - return false; - }) - .removeClass('button-hidden'); + .click(() => { + clearStatus(); + appNavigationHistory.pop(); + const previousPage = appNavigationHistory[appNavigationHistory.length - 1]; + setWindow(previousPage, true); + return false; + }) + .removeClass('button-hidden'); } else { - backButton.addClass('button-hidden'); // Hide when at the first page + backButton.addClass('button-hidden'); } const submitButtonText = MESSAGES['submit-' + window]; @@ -68,7 +68,6 @@ function setWindow(window, back) { } - function addEmail(e) { const address = $('#email-form [id=email]').val().toLowerCase();