upgrades in directive

better default validation function using scope string

Author: codekraft-studio

dist/angular-async-validation.js

@@ -1,19 +1,20 @@
 /**
-* Package: angular-async-validation - v0.0.2 
+* Package: angular-async-validation - v0.0.4 
 * Description: A multi purpose directive for input async validation 
-* Last build: 2016-12-29 
+* Last build: 2017-05-04 
 * @author codekraft-studio 
 * @license ISC 
 */
 angular.module('angular-async-validation', []);
 
 angular.module('angular-async-validation')
 
-.directive('asyncValidation', ['$log', '$http', function ($log, $http) {
+.directive('asyncValidation', ['$log', '$q', '$http', function ($log, $q, $http) {
 
 	var directive = {
 		restrict: 'A',
 		require: 'ngModel',
+		scope: { asyncValidation: '=', validatorName: '@?' },
 		link: _link
 	};
 
@@ -22,18 +23,15 @@ angular.module('angular-async-validation')
 	function _link(scope, elem, attrs, ngModel) {
 
 		// The async validation function
-		var validationFunction;
+		var validationFunction, validatorName = scope.validatorName ? scope.validatorName : 'asyncValidator';
 
-		// The attribute value
-		var asyncValidation = scope.$eval(attrs.asyncValidation);
-
-		if( !asyncValidation || !asyncValidation.length || typeof asyncValidation === 'undefined' ) {
+		// Check if the argument passed satisfy the requirements
+		if( !scope.asyncValidation && !angular.isString(scope.asyncValidation) && !angular.isFunction(scope.asyncValidation) ) {
 			$log.warn('angular-async-validation: missing or empty argument in async-validation attribute on:', elem);
 			return;
 		}
 
-		// If no options are specified
-		// set to the defaults
+		// If no options are specified set to the defaults
 		if( !ngModel.$options || !ngModel.$options.getOption('debounce')  ) {
 
 			ngModel.$options = ngModel.$options.createChild({
@@ -44,39 +42,55 @@ angular.module('angular-async-validation')
 
 		}
 
-		// If is a string use it as
-		// path for ajax request
-		if( angular.isString(asyncValidation) ) {
+		// If is a string use it as path for http request
+		if( angular.isString(scope.asyncValidation) ) {
 
 			validationFunction = function (modelValue, viewValue) {
 
-				// get the value
+				// get the current value
 				var value = modelValue || viewValue;
 
+				// Consider empty models to be valid
+				// for this type of validation
+				if (ngModel.$isEmpty(value)) {
+          return $q.resolve();
+        }
+
+				// Init the deferred object
+				var deferred = $q.defer();
+
 				// build the url
-				var url = asyncValidation.replace(':value', value);
+				var url = scope.asyncValidation.replace(':value', value);
 
 				// run the request
-				return $http.get(url, {
+				$http.get(url, {
 					notifyError: false
 				}).then(function (response) {
-					return $q.reject();
+
+					if( !response.data ) {
+						deferred.resolve();
+					} else {
+						deferred.reject();
+					}
+					
 				}, function () {
-					return $q.resolve();
+					deferred.resolve();
 				});
 
+				return deferred.promise;
+
 			};
 
 		}
 
 		// If is a function defined by users
 		// assign it to asyncValidators
-		if( angular.isFunction(asyncValidation) ) {
-			validationFunction = asyncValidation;
+		if( angular.isFunction(scope.asyncValidation) ) {
+			validationFunction = scope.asyncValidation;
 		}
 
-		// Add the async validator
-		ngModel.$asyncValidators.asyncValidation = validationFunction;
+		// Add the async validator (optionally using custom name)
+		ngModel.$asyncValidators[validatorName] = validationFunction;
 
 	}
 

dist/angular-async-validation.min.js

@@ -5,7 +5,7 @@ angular.module('angular-async-validation')
 	var directive = {
 		restrict: 'A',
 		require: 'ngModel',
-		scope: { asyncValidation: '=' },
+		scope: { asyncValidation: '=', validatorName: '@?' },
 		link: _link
 	};
 
@@ -14,7 +14,7 @@ angular.module('angular-async-validation')
 	function _link(scope, elem, attrs, ngModel) {
 
 		// The async validation function
-		var validationFunction;
+		var validationFunction, validatorName = scope.validatorName ? scope.validatorName : 'asyncValidator';
 
 		// Check if the argument passed satisfy the requirements
 		if( !scope.asyncValidation && !angular.isString(scope.asyncValidation) && !angular.isFunction(scope.asyncValidation) ) {
@@ -38,13 +38,13 @@ angular.module('angular-async-validation')
 
 			validationFunction = function (modelValue, viewValue) {
 
-				// get the value
+				// get the current value
 				var value = modelValue || viewValue;
 
 				// Consider empty models to be valid
 				// for this type of validation
 				if (ngModel.$isEmpty(value)) {
-          return $q.resolve();;
+          return $q.resolve();
         }
 
 				// Init the deferred object
@@ -54,14 +54,22 @@ angular.module('angular-async-validation')
 				var url = scope.asyncValidation.replace(':value', value);
 
 				// run the request
-				return $http.get(url, {
+				$http.get(url, {
 					notifyError: false
 				}).then(function (response) {
-					return $q.reject();
+
+					if( !response.data ) {
+						deferred.resolve();
+					} else {
+						deferred.reject();
+					}
+					
 				}, function () {
-					return $q.resolve();
+					deferred.resolve();
 				});
 
+				return deferred.promise;
+
 			};
 
 		}
@@ -72,8 +80,8 @@ angular.module('angular-async-validation')
 			validationFunction = scope.asyncValidation;
 		}
 
-		// Add the async validator
-		ngModel.$asyncValidators.asyncValidation = validationFunction;
+		// Add the async validator (optionally using custom name)
+		ngModel.$asyncValidators[validatorName] = validationFunction;
 
 	}