From 2c67ed967332353a0848481a7ab33380b5fe80c4 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Tue, 4 Apr 2017 14:58:20 +0300
Subject: [PATCH] Use native HTML email validation instead of "jquery validate"

---
 .../javascripts/shared/jquery.validate.bootstrap.coffee     | 4 ----
 app/views/admin/admin_users/_form.haml                      | 2 +-
 app/views/admin/mail_templates/_form.haml                   | 6 +++---
 app/views/admin/registrars/_form.haml                       | 4 ++--
 app/views/registrar/contacts/form/_general.haml             | 2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/shared/jquery.validate.bootstrap.coffee b/app/assets/javascripts/shared/jquery.validate.bootstrap.coffee
index 698eb9706..41b63748c 100644
--- a/app/assets/javascripts/shared/jquery.validate.bootstrap.coffee
+++ b/app/assets/javascripts/shared/jquery.validate.bootstrap.coffee
@@ -17,7 +17,3 @@ $.validator.setDefaults
     else
       error.insertAfter element
     return
-
-jQuery.validator.addMethod 'lax_email', ((value, element) ->
-  @optional(element) or (value.match(new RegExp("@", "g")) || []).length == 1
-), 'Please enter a valid email address.'
diff --git a/app/views/admin/admin_users/_form.haml b/app/views/admin/admin_users/_form.haml
index 0904ea99f..512cddde8 100644
--- a/app/views/admin/admin_users/_form.haml
+++ b/app/views/admin/admin_users/_form.haml
@@ -38,7 +38,7 @@
         .col-md-4.control-label
           = f.label :email
         .col-md-8
-          = f.text_field(:email, class: 'form-control', lax_email: true)
+          = f.email_field :email, class: 'form-control'
       .form-group
         .col-md-4.control-label
           = f.label :country_code, t(:country)
diff --git a/app/views/admin/mail_templates/_form.haml b/app/views/admin/mail_templates/_form.haml
index 6e9d828c5..739cce665 100644
--- a/app/views/admin/mail_templates/_form.haml
+++ b/app/views/admin/mail_templates/_form.haml
@@ -24,17 +24,17 @@
             .col-md-4.control-label
               = f.label :from
             .col-md-7
-              = f.text_field(:from, class: 'form-control', lax_email: true)
+              = f.email_field :from, class: 'form-control'
           .form-group
             .col-md-4.control-label
               = f.label :cc
             .col-md-7
-              = f.text_field(:cc, class: 'form-control', lax_email: true)
+              = f.email_field :cc, class: 'form-control'
           .form-group
             .col-md-4.control-label
               = f.label :bcc
             .col-md-7
-              = f.text_field(:bcc, class: 'form-control', lax_email: true)
+              = f.email_field :bcc, class: 'form-control'
           .form-group
             .col-md-12
               = f.label :body, t(:html_body)
diff --git a/app/views/admin/registrars/_form.haml b/app/views/admin/registrars/_form.haml
index d62a375f8..abf440921 100644
--- a/app/views/admin/registrars/_form.haml
+++ b/app/views/admin/registrars/_form.haml
@@ -36,12 +36,12 @@
             .col-md-4.control-label
               = f.label :email
             .col-md-7
-              = f.text_field(:email, class: 'form-control', lax_email: true)
+              = f.email_field :email, class: 'form-control'
           .form-group
             .col-md-4.control-label
               = f.label :billing_email
             .col-md-7
-              = f.text_field(:billing_email, class: 'form-control', lax_email: true)
+              = f.email_field :billing_email, class: 'form-control'
 
   .row
     .col-md-8
diff --git a/app/views/registrar/contacts/form/_general.haml b/app/views/registrar/contacts/form/_general.haml
index a6ecbb500..b8ff90965 100644
--- a/app/views/registrar/contacts/form/_general.haml
+++ b/app/views/registrar/contacts/form/_general.haml
@@ -61,7 +61,7 @@
       .col-md-3.control-label
         = f.label :email, t(:email) + '*'
       .col-md-7
-        = f.text_field :email, class: 'form-control', required: true, lax_email: true
+        = f.email_field :email, class: 'form-control', required: true
 
     .form-group
       .col-md-3.control-label