service a factory, fuera default values, ok validacion mail

Jose Pinto
1 parent 8a6681554e
Showing 2 changed files with 7 additions and 13 deletions Show diff stats
src/js/controller.js
src/js/service.js
@@ -55,11 +55,15 @@ angular.module(&#39;focaModal&#39;)
         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;
         }
     }
 ]);
 angular.module('focaModal')
-    .service('focaModalService', [
+    .factory('focaModalService', [
         '$uibModal', 'API_ENDPOINT', '$http',
         function($uibModal, API_ENDPOINT, $http) {
             return {
@@ -72,16 +72,6 @@ angular.module(&#39;focaModal&#39;)
                     );
                 },
                 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',
...	...	@@ -55,11 +55,15 @@ angular.module('focaModal')
55	55	function validateEmails(emails) {
56	56	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,}))$/;
57	57	var arr = emails.split(',');
	58	+ var result = true;
58	59
59	60	arr.forEach(function(email) {
60		- if(!re.test(String(email).trim().toLowerCase())) return false;
	61	+ var val = String(email).trim().toLowerCase();
	62	+
	63	+ if(!re.test(val)) result = false;
61	64	});
62		- return true;
	65	+
	66	+ return result;
63	67	}
64	68	}
65	69	]);
1	1	angular.module('focaModal')
2		- .service('focaModalService', [
	2	+ .factory('focaModalService', [
3	3	'$uibModal', 'API_ENDPOINT', '$http',
4	4	function($uibModal, API_ENDPOINT, $http) {
5	5	return {
...	...	@@ -72,16 +72,6 @@ angular.module('focaModal')
72	72	);
73	73	},
74	74	prompt: function(options) {
75		- //DEFAULT VALUES
76		- var defaultValues = {
77		- titulo: '',
78		- value: '',
79		- textarea: false,
80		- readonly: false,
81		- email: false
82		- };
83		- options = Object.assign(defaultValues, options);
84		-
85	75	return $uibModal.open({
86	76	templateUrl: 'modal-prompt.html',
87	77	controller: 'focaModalPromptController',