Merge branch 'branch1' into 'master'

Branch1



See merge request !2

javascript.js

@@ -14,13 +14,13 @@ function validate() {
   // Validate
   // Validate
   if (firstname == "" || lastname == "" || email=="" || cemail=="" || bday=="" ) {
   if (firstname == "" || lastname == "" || email=="" || cemail=="" || bday=="" ) {
     message.innerHTML = "Input Error";
     message.innerHTML = "Input Error";
-		check = false;
+    check = false;
   }
   }
   else {
   else {
-		if (email == cemail) {
-			if (alphabeta.test(firstname) == true && alphabeta.test(lastname) == true && date.test(bday) == true && filter.test(email) == true && filter.test(cemail) == true) {
+    if (email == cemail) {
+      if (alphabeta.test(firstname) == true && alphabeta.test(lastname) == true && date.test(bday) == true && filter.test(email) == true && filter.test(cemail) == true) {
         alert("Thank for your registering");
         alert("Thank for your registering");
-				check = true;
+        check = true;
       }
       }
       else {
       else {
         message.innerHTML = "Input Error";
         message.innerHTML = "Input Error";
@@ -29,7 +29,7 @@ function validate() {
     }
     }
     else {
     else {
       message.innerHTML = "Input Error";
       message.innerHTML = "Input Error";
-			check = false;
+      check = false;
     }
     }
   }
   }
   return check;
   return check;