From 4a6f50c9b0d793b8ff2e956dc8e43ba094d0a3a2 Mon Sep 17 00:00:00 2001 From: Jose Pinto Date: Wed, 13 Mar 2019 16:21:13 -0300 Subject: [PATCH] service a factory, fuera default values, ok validacion mail --- src/js/controller.js | 8 ++++++-- src/js/service.js | 12 +----------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/js/controller.js b/src/js/controller.js index 72d074f..d5e9e68 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -55,11 +55,15 @@ angular.module('focaModal') function validateEmails(emails) { var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; var arr = emails.split(','); + var result = true; arr.forEach(function(email) { - if(!re.test(String(email).trim().toLowerCase())) return false; + var val = String(email).trim().toLowerCase(); + + if(!re.test(val)) result = false; }); - return true; + + return result; } } ]); diff --git a/src/js/service.js b/src/js/service.js index c41cb15..0b25797 100644 --- a/src/js/service.js +++ b/src/js/service.js @@ -1,5 +1,5 @@ angular.module('focaModal') - .service('focaModalService', [ + .factory('focaModalService', [ '$uibModal', 'API_ENDPOINT', '$http', function($uibModal, API_ENDPOINT, $http) { return { @@ -72,16 +72,6 @@ angular.module('focaModal') ); }, prompt: function(options) { - //DEFAULT VALUES - var defaultValues = { - titulo: '', - value: '', - textarea: false, - readonly: false, - email: false - }; - options = Object.assign(defaultValues, options); - return $uibModal.open({ templateUrl: 'modal-prompt.html', controller: 'focaModalPromptController', -- 1.9.1