Merge pull request #25 from privacybydesign/fix/hide-back-button-on-f…

…irst-page Fix: Hide Back button on first page as window.close() does not work on Firefox
privacybydesign · Nov 2, 2022 · 5a576bd · 5a576bd
2 parents e1d0862 + dae2a45
commit 5a576bd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/webapp/common.js b/webapp/common.js
@@ -38,22 +38,23 @@ function setWindow(window, back) {
     if (back) {
         backButton
           .click(() => {clearStatus(); setWindow(back); return false;})
-          .removeAttr('href')
+          .removeClass('button-hidden');
+    } else if (history.length > 1) {
+        backButton
+          .click(() => {clearStatus(); history.back(); return false;})
           .removeClass('button-hidden');
     } else {
-        backButton.attr('href', MESSAGES['issuers-overview-page']);
-        if (isInApp)
-            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
+    } else {
         submitButton.addClass('hidden');
+    }
 }
 
 function addEmail(e) {

diff --git a/webapp/en/index.html b/webapp/en/index.html
@@ -62,7 +62,7 @@ <h1>Adding an e-mail address</h1>
   </main>
   <footer>
     <div class="actions">
-      <a id="back-button" href="https://privacybydesign.foundation/issuance/">
+      <a id="back-button">
         Back
       </a>
       <button id="submit-button" type="submit"></button>

diff --git a/webapp/nl/index.html b/webapp/nl/index.html
@@ -55,7 +55,7 @@ <h1>E-mailadres toevoegen</h1>
   </main>
   <footer>
     <div class="actions">
-      <a id="back-button" href="https://privacybydesign.foundation/uitgifte/">
+      <a id="back-button">
         Terug
       </a>
       <button id="submit-button" type="submit"></button>