From 2555cbf6ffd83d347b3e356e5202a88c82a4a12c Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Tue, 8 Oct 2024 18:28:55 +0800
Subject: [PATCH] fix: JavaScript error on signup page (#6788)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#### What type of PR is this?

/area core
/kind bug
/milestone 2.20.x

#### What this PR does / why we need it:

修复注册页面的 JS 错误。

#### Does this PR introduce a user-facing change?

```release-note
None
```
---
 .../gateway_modules/form_fragments.html       | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/application/src/main/resources/templates/gateway_modules/form_fragments.html b/application/src/main/resources/templates/gateway_modules/form_fragments.html
index 1a8000281..e0d50c044 100644
--- a/application/src/main/resources/templates/gateway_modules/form_fragments.html
+++ b/application/src/main/resources/templates/gateway_modules/form_fragments.html
@@ -152,13 +152,31 @@
     </div>
 
     <script th:inline="javascript">
+        document.addEventListener("DOMContentLoaded", function () {
+            var password = document.getElementById("password"),
+                confirm_password = document.getElementById("confirmPassword");
+
+            function validatePassword() {
+                if (password.value != confirm_password.value) {
+                    confirm_password.setCustomValidity("Passwords Don't Match");
+                } else {
+                    confirm_password.setCustomValidity("");
+                }
+            }
+
+            password.onchange = validatePassword;
+            confirm_password.onkeyup = validatePassword;
+        });
+    </script>
+
+    <script th:if="${globalInfo.mustVerifyEmailOnRegistration}" th:inline="javascript">
         document.addEventListener("DOMContentLoaded", function () {
             function sendRequest() {
                 return new Promise((resolve, reject) => {
                     const email = document.getElementById("email").value;
 
                     if (!email) {
-                        throw new Error(/*[[#{form.signup.emailCode.send.emptyValidation}]]*/);
+                        throw new Error(/*[[#{form.signup.emailCode.send.emptyValidation}]]*/"");
                     }
 
                     fetch("/signup/send-email-code", {
@@ -183,20 +201,6 @@
 
             const emailCodeSendButton = document.getElementById("emailCodeSendButton");
             sendVerificationCode(emailCodeSendButton, sendRequest);
-
-            var password = document.getElementById("password"),
-                confirm_password = document.getElementById("confirmPassword");
-
-            function validatePassword() {
-                if (password.value != confirm_password.value) {
-                    confirm_password.setCustomValidity("Passwords Don't Match");
-                } else {
-                    confirm_password.setCustomValidity("");
-                }
-            }
-
-            password.onchange = validatePassword;
-            confirm_password.onkeyup = validatePassword;
         });
     </script>
 </form>