Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve contact validation code

Browse Source
This commit is contained in:
Hillel Coren 2016-12-25 10:54:01 +02:00
parent 5f39ec1162
commit b1f2645a35
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
resources/views/invoices/knockout.blade.php
View File

@ -97,19 +97,12 @@ function ViewModel(data) {
} }
var isValid = true; var isValid = true;
$('input.client-email').each(function(item, value) { var contacts = self.invoice().client().contacts();
var $email = $(value); $(contacts).each(function(item, value) {
var email = $(value).val(); if (!value.isValid()) {
// Trim whitespace
email = (email || '').trim();
$email.val(email);
if (!firstName && (!email || !isValidEmailAddress(email))) {
isValid = false; isValid = false;
} }
}); });
if (!isValid) { if (!isValid) {
$('#emailError').css( "display", "inline" ); $('#emailError').css( "display", "inline" );
return; return;
@ -649,6 +642,18 @@ function ContactModel(data) {
return '#B1B5BA'; return '#B1B5BA';
} }
}); });
self.isValid = function() {
var email = (self.email() || '').trim();
var emailValid = isValidEmailAddress(email);
// if the email is set it must be valid
if (email && ! emailValid) {
return false;
} else {
return self.first_name() || email;
}
}
} }
function ItemModel(data) { function ItemModel(data) {