From 9fcd5f83733e65596d3ec86d40893e7109194d97 Mon Sep 17 00:00:00 2001 From: Ghislain B Date: Sun, 15 Nov 2015 00:42:39 -0500 Subject: [PATCH] Added validation-callback (#79), added #81, #82 - Added new validation-callback attribute, runs after the debounce/blur and validaiton are completed - Added possibility passing arguments to Custom & Remote validators - Added new Global Options: hideErrorUnderInputs --- app.js | 2 +- bower.json | 2 +- dist/angular-validation.min.js | 10 +- more-examples/customRemote/app.js | 93 +++++++++++++ more-examples/customRemote/index.html | 127 ++++++++++++++++++ more-examples/customValidation/app.js | 2 +- more-examples/customValidation/index.html | 4 +- more-examples/validationCallback/app.js | 36 +++++ more-examples/validationCallback/index.html | 82 ++++++++++++ package.json | 2 +- protractor/callback_spec.js | 104 +++++++++++++++ protractor/conf.js | 2 + protractor/custom_spec.js | 17 +-- protractor/mixed_validation_spec.js | 4 +- protractor/remote_spec.js | 130 +++++++++++++++++++ readme.md | 17 ++- src/validation-common.js | 137 +++++++++++--------- src/validation-directive.js | 18 ++- src/validation-service.js | 52 ++++++-- templates/testingFormDirective.html | 2 +- 20 files changed, 735 insertions(+), 108 deletions(-) create mode 100644 more-examples/customRemote/app.js create mode 100644 more-examples/customRemote/index.html create mode 100644 more-examples/validationCallback/app.js create mode 100644 more-examples/validationCallback/index.html create mode 100644 protractor/callback_spec.js create mode 100644 protractor/remote_spec.js diff --git a/app.js b/app.js index a72ed91..fe42673 100644 --- a/app.js +++ b/app.js @@ -117,7 +117,7 @@ myApp.controller('CtrlValidationService', ['$q', '$scope', '$translate', 'valida // friendlyName: $translate.instant('FIRST_NAME'), debounce: 1000, scope: $scope, - rules: 'alpha|min_len:2|remote:customRemoteValidationCall|required' + rules: 'alpha|min_len:2|remote:customRemoteValidationCall()|required' }); // you can also chain validation service and add multiple validators at once diff --git a/bower.json b/bower.json index d29d6a6..b6b17c2 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "angular-validation-ghiscoding", - "version": "1.4.13", + "version": "1.4.14", "author": "Ghislain B.", "description": "Angular-Validation Directive and Service (ghiscoding)", "main": [ diff --git a/dist/angular-validation.min.js b/dist/angular-validation.min.js index ff42c3c..aef57a1 100644 --- a/dist/angular-validation.min.js +++ b/dist/angular-validation.min.js @@ -2,11 +2,11 @@ * Angular-Validation Directive and Service (ghiscoding) * http://github.com/ghiscoding/angular-validation * @author: Ghislain B. - * @version: 1.4.13 + * @version: 1.4.14 * @license: MIT - * @build: Tue Nov 03 2015 23:43:10 GMT-0500 (Eastern Standard Time) + * @build: Sat Nov 14 2015 23:48:37 GMT-0500 (Eastern Standard Time) */ -angular.module("ghiscoding.validation",["pascalprecht.translate"]).directive("validation",["$q","$timeout","validationCommon",function(a,e,i){return{restrict:"A",require:"ngModel",link:function(t,n,r,l){function o(i,r){var o=a.defer(),d=!1,m="undefined"!=typeof r?r:b.typingLimit,s=b.getFormElementByName(l.$name);if(Array.isArray(i)){if(E=[],$="",m=0,i.length>0)return"function"==typeof s.ctrl.$setTouched&&s.ctrl.$setTouched(),u(i,typeof i);m=0}return i&&i.badInput?v():(b.validate(i,!1),b.isFieldRequired()||""!==i&&null!==i&&"undefined"!=typeof i?(s&&(s.isValidationCancelled=!1),(i||b.isFieldRequired())&&l.$setValidity("validation",!1),"SELECT"===n.prop("tagName").toUpperCase()?(d=b.validate(i,!0),l.$setValidity("validation",d),o.resolve({isFieldValid:d,formElmObj:s,value:i}),o.promise):("undefined"!=typeof i&&(0===r?(d=b.validate(i,!0),t.$evalAsync(l.$setValidity("validation",d)),o.resolve({isFieldValid:d,formElmObj:s,value:i})):(b.updateErrorMsg(""),e.cancel(V),V=e(function(){d=b.validate(i,!0),t.$evalAsync(l.$setValidity("validation",d)),o.resolve({isFieldValid:d,formElmObj:s,value:i})},m))),o.promise)):(f(),o.resolve({isFieldValid:!0,formElmObj:s,value:i}),o.promise))}function d(a,e,i){var t=o(a,0);t&&"function"==typeof t.then&&(E.push(t),parseInt(e)===i-1&&E.forEach(function(a){a.then(function(a){switch(O){case"all":if(a.isFieldValid===!1){var e=b.getGlobalOptions();a.formElmObj.translatePromise.then(function(i){$.length>0&&e.displayOnlyLastErrorMsg?$="["+a.value+"] :: "+(a.formElmObj.validator&&a.formElmObj.validator.params?String.format(i,a.formElmObj.validator.params):i):$+=" ["+a.value+"] :: "+(a.formElmObj.validator&&a.formElmObj.validator.params?String.format(i,a.formElmObj.validator.params):i),b.updateErrorMsg($,{isValid:!1}),b.addToValidationSummary(a.formElmObj,$)})}break;case"one":default:a.isFieldValid===!0&&(l.$setValidity("validation",!0),f())}})}))}function m(a){var e=b.getFormElementByName(l.$name),i="undefined"!=typeof l.$modelValue?l.$modelValue:a.target.value;e.isValidationCancelled?l.$setValidity("validation",!0):o(i,10)}function u(a,e){var i=a.length;if("string"===e)for(var t in a)d(a[t],t,i);else if("object"===e)for(var t in a)if(a.hasOwnProperty(t)){var n=a[t];for(var r in n)if(n.hasOwnProperty(r)){if(j&&r!==j)continue;d(n[r],t,i)}}}function s(){f(),b.removeFromValidationSummary(h);var a=b.arrayFindObject(g,"elmName",l.$name);a&&a.watcherHandler()}function f(){var a=b.getFormElementByName(l.$name);a&&(a.isValidationCancelled=!0),e.cancel(V),b.updateErrorMsg(""),l.$setValidity("validation",!0),p()}function v(){e.cancel(V);var a=b.getFormElementByName(l.$name);b.updateErrorMsg("INVALID_KEY_CHAR",{isValid:!1,translate:!0}),b.addToValidationSummary(a,"INVALID_KEY_CHAR",!0)}function c(){return!!n.prop("validity")&&n.prop("validity").badInput===!0}function y(){var a=l.$modelValue||"";Array.isArray(a)||l.$setValidity("validation",b.validate(a,!1));var e=b.getFormElementByName(l.$name);e&&(e.isValidationCancelled=!1),p(),n.bind("blur",m)}function p(){"function"==typeof m&&n.unbind("blur",m)}var V,b=new i(t,n,r,l),$="",E=[],g=[],h=r.name,O=r.hasOwnProperty("validArrayRequireHowMany")?r.validArrayRequireHowMany:"one",j=r.hasOwnProperty("validationArrayObjprop")?r.validationArrayObjprop:null,F=t.$watch(function(){return c()?{badInput:!0}:l.$modelValue},function(a){return a&&a.badInput?(p(),v()):void o(a)},!0);g.push({elmName:h,watcherHandler:F}),r.$observe("disabled",function(a){a?(f(),b.removeFromValidationSummary(h)):y()}),n.on("$destroy",function(){s()}),t.$watch(function(){return n.attr("validation")},function(a){"undefined"==typeof a||""===a?s():(b.defineValidation(),y())}),n.bind("blur",m)}}}]); -angular.module("ghiscoding.validation").factory("validationCommon",["$rootScope","$timeout","$translate","validationRules",function(e,t,a,r){function n(e,t,r){if("undefined"!=typeof e&&null!=e){var n=e.ctrl&&e.ctrl.$name?e.ctrl.$name:e.attrs&&e.attrs.name?e.attrs.name:e.elm.attr("name"),i=x(n,e),o=S(H,"field",n);if(o>=0&&""===t)H.splice(o,1);else if(""!==t){r&&(t=a.instant(t));var s=e.attrs&&e.friendlyName?a.instant(e.friendlyName):"",l={field:n,friendlyName:s,message:t,formName:i?i.$name:null};o>=0?H[o]=l:H.push(l)}if(e.scope.$validationSummary=H,i&&(i.$validationSummary=O(H,"formName",i.$name)),P&&P.controllerAs&&(P.controllerAs.$validationSummary=H,i&&i.$name)){var m=i.$name.indexOf(".")>=0?i.$name.split(".")[1]:i.$name,u=P.controllerAs[m]?P.controllerAs[m]:e.elm.controller()[m];u&&(u.$validationSummary=O(H,"formName",i.$name))}return H}}function i(){var e=this,t={};e.validators=[],e.typingLimit=D,e.validatorAttrs.hasOwnProperty("debounce")?e.typingLimit=parseInt(e.validatorAttrs.debounce,10):e.validatorAttrs.hasOwnProperty("typingLimit")?e.typingLimit=parseInt(e.validatorAttrs.typingLimit,10):P&&P.hasOwnProperty("debounce")&&(e.typingLimit=parseInt(P.debounce,10));var a=e.validatorAttrs.rules||e.validatorAttrs.validation;if(a.indexOf("pattern=/")>=0){var n=a.match(/pattern=(\/.*\/[igm]*)(:alt=(.*))?/);if(!n||n.length<3)throw'Regex validator within the validation needs to be define with an opening "/" and a closing "/", please review your validator.';var i=n[1],o=n[2]?n[2].replace(/\|(.*)/,""):"",s=i.match(new RegExp("^/(.*?)/([gimy]*)$")),l=new RegExp(s[1],s[2]);t={altMsg:o,message:o.replace(/:alt=/,""),pattern:l},a=a.replace("pattern="+i,"pattern")}else if(a.indexOf("regex:")>=0){var n=a.match("regex:(.*?):regex");if(n.length<2)throw'Regex validator within the validation needs to be define with an opening "regex:" and a closing ":regex", please review your validator.';var m=n[1].split(":=");t={message:m[0],pattern:m[1]},a=a.replace(n[0],"regex:")}var u=a.split("|");if(u){e.bFieldRequired=a.indexOf("required")>=0?!0:!1;for(var p=0,d=u.length;d>p;p++){var c=u[p].split(":"),f=u[p].indexOf("alt=")>=0?!0:!1;e.validators[p]=r.getElementValidators({altText:f===!0?2===c.length?c[1]:c[2]:"",customRegEx:t,rule:c[0],ruleParams:f&&2===c.length?null:c[1]})}}return e}function o(e){return $(M,"fieldName",e)}function s(e){return e?O(M,"formName",e):M}function l(){return P}function m(e,t,a,r){this.scope=e,this.elm=t,this.ctrl=r,this.validatorAttrs=a,y(t,a,r,e),this.defineValidation()}function u(){var e=this;return e.bFieldRequired}function p(e,t){var a={};for(var r in e)a[r]=e[r];for(var r in t)a[r]=t[r];return a}function d(e){var t=S(M,"fieldName",e);t>=0&&M.splice(t,1)}function c(e,t){var a=this,r=x(e,a),n=t||H,i=S(n,"field",e);if(i>=0&&n.splice(i,1),i=S(H,"field",e),i>=0&&H.splice(i,1),a.scope.$validationSummary=H,r&&(r.$validationSummary=O(H,"formName",r.$name)),P&&P.controllerAs&&(P.controllerAs.$validationSummary=H,r)){var o=r.$name.indexOf(".")>=0?r.$name.split(".")[1]:r.$name;P.controllerAs[o]&&(P.controllerAs[o].$validationSummary=O(H,"formName",r.$name))}return H}function f(e){P.displayOnlyLastErrorMsg=e}function g(e){var t=this;return P=p(P,e),t}function v(e,t){var r=this;t&&t.obj&&(r=t.obj,r.validatorAttrs=t.obj.attrs);var n=t&&t.elm?t.elm:r.elm,i=n&&n.attr("name")?n.attr("name"):null;if("undefined"==typeof i||null===i){var o=n?n.attr("ng-model"):"unknown";throw'Angular-Validation Service requires you to have a (name="") attribute on the element to validate... Your element is: ng-model="'+o+'"'}var s=t&&t.translate?a.instant(e):e,l=i.replace(/[|&;$%@"<>()+,\[\]\{\}]/g,""),m=null;if(r.validatorAttrs&&r.validatorAttrs.hasOwnProperty("validationErrorTo")){var u=r.validatorAttrs.validationErrorTo.charAt(0),p="."===u||"#"===u?r.validatorAttrs.validationErrorTo:"#"+r.validatorAttrs.validationErrorTo;m=angular.element(document.querySelector(p))}m&&0!==m.length||(m=angular.element(document.querySelector(".validation-"+l)));var d=t&&t.isSubmitted?t.isSubmitted:!1;t&&!t.isValid&&(d||r.ctrl.$dirty||r.ctrl.$touched)?m.length>0?m.html(s):n.after(''+s+""):m.html("")}function h(e,t){var r,i=this,s=!0,l=!0,m={message:""};"undefined"==typeof e&&(e="");for(var u=i.ctrl&&i.ctrl.$name?i.ctrl.$name:i.attrs&&i.attrs.name?i.attrs.name:i.elm.attr("name"),p=o(u),d=i.validatorAttrs.rules||i.validatorAttrs.validation,c=0,f=i.validators.length;f>c;c++){r=i.validators[c],"autoDetect"===r.type&&(r=G(r,e));var g=i.attrs?i.attrs.ngDisabled:i.validatorAttrs.ngDisabled;switch(r.type){case"conditionalDate":s=k(e,r,d);break;case"conditionalNumber":s=L(e,r);break;case"javascript":s=q(e,r,i,p,t,m);break;case"matching":s=C(e,r,i,m);break;case"remote":s=U(e,r,i,p,t,m);break;default:s=j(e,r,d,i)}(!i.bFieldRequired&&!e||i.elm.prop("disabled")||i.scope.$eval(g))&&(s=!0),s||(l=!1,function(e,r,n){var o=n.message;n.altText&&n.altText.length>0&&(o=n.altText.replace("alt=",""));var s=a(o);e.translatePromise=s,e.validator=n,s.then(function(a){m.message.length>0&&P.displayOnlyLastErrorMsg?m.message=" "+(n&&n.params?String.format(a,n.params):a):m.message+=" "+(n&&n.params?String.format(a,n.params):a),b(i,e,m.message,l,t)})["catch"](function(){n.altText&&n.altText.length>0&&(m.message.length>0&&P.displayOnlyLastErrorMsg?m.message=" "+o:m.message+=" "+o,b(i,e,m.message,l,t))})}(p,s,r))}return s&&(n(i,""),i.updateErrorMsg("",{isValid:s})),p&&(p.isValid=l,l&&(p.message="")),l}function y(e,t,r,n){var i=t.name?t.name:e.attr("name"),o=x(i,{scope:n}),s=t&&t.friendlyName?a.instant(t.friendlyName):"",l={fieldName:i,friendlyName:s,elm:e,attrs:t,ctrl:r,scope:n,isValid:!1,message:"",formName:o?o.$name:null},m=S(M,"fieldName",e.attr("name"));return m>=0?M[m]=l:M.push(l),M}function b(e,t,a,r,i){a=a.trim(),t&&t.isValidationCancelled===!0&&(a=""),n(t,a),(e.validatorAttrs.preValidateFormElements||P.preValidateFormElements)&&(t&&"function"==typeof e.ctrl.$setTouched&&t.ctrl.$setTouched(),e.ctrl.$dirty===!1&&v(a,{isSubmitted:!0,isValid:r,obj:t})),i&&t&&!t.isValid?e.updateErrorMsg(a,{isValid:r,obj:t}):t&&t.isValid&&n(t,"")}function $(e,t,a){if(e)for(var r=0;rr;r++)t[a[r]]&&(t=t[a[r]]);return t}function x(e,t){if(P&&P.formName){var a=document.querySelector('[name="'+P.formName+'"]');if(a)return a.$name=P.formName,a}for(var r=document.getElementsByName(e),a=null,n=0;n=0?A(o,t.scope):t.scope[o]))return"undefined"==typeof a.$name&&(a.$name=o),a}if(i){var o=i.getAttribute("name");if(o){var s={$name:o,specialNote:"Created by Angular-Validation for Isolated Scope usage"};if(P&&P.controllerAs&&o.indexOf(".")>=0){var l=o.split(".");return t.scope[l[0]][l[1]]=s}return t.scope[o]=s}}return null}function V(e){return!isNaN(parseFloat(e))&&isFinite(e)}function w(e,t){var a="",r="-",n=[],i=[],o="",s="",l="";switch(t.toUpperCase()){case"EURO_LONG":case"EURO-LONG":a=e.substring(0,10),r=e.substring(2,3),n=N(a,r),l=n[0],s=n[1],o=n[2],i=e.length>8?e.substring(9).split(":"):null;break;case"UK":case"EURO":case"EURO_SHORT":case"EURO-SHORT":case"EUROPE":a=e.substring(0,8),r=e.substring(2,3),n=N(a,r),l=n[0],s=n[1],o=parseInt(n[2])<50?"20"+n[2]:"19"+n[2],i=e.length>8?e.substring(9).split(":"):null;break;case"US_LONG":case"US-LONG":a=e.substring(0,10),r=e.substring(2,3),n=N(a,r),s=n[0],l=n[1],o=n[2],i=e.length>8?e.substring(9).split(":"):null;break;case"US":case"US_SHORT":case"US-SHORT":a=e.substring(0,8),r=e.substring(2,3),n=N(a,r),s=n[0],l=n[1],o=parseInt(n[2])<50?"20"+n[2]:"19"+n[2],i=e.length>8?e.substring(9).split(":"):null;break;case"ISO":default:a=e.substring(0,10),r=e.substring(4,5),n=N(a,r),o=n[0],s=n[1],l=n[2],i=e.length>10?e.substring(11).split(":"):null}var m=i&&3===i.length?i[0]:0,u=i&&3===i.length?i[1]:0,p=i&&3===i.length?i[2]:0;return new Date(o,s-1,l,m,u,p)}function N(e,t){var a=[];switch(t){case"/":a=e.split("/");break;case".":a=e.split(".");break;case"-":default:a=e.split("-")}return a}function E(e,t,a){var r=!1;switch(e){case"<":r=a>t?!0:!1;break;case"<=":r=a>=t?!0:!1;break;case">":r=t>a?!0:!1;break;case">=":r=t>=a?!0:!1;break;case"!=":case"<>":r=t!=a?!0:!1;break;case"!==":r=t!==a?!0:!1;break;case"=":case"==":r=t==a?!0:!1;break;case"===":r=t===a?!0:!1;break;default:r=!1}return r}function R(){return this.replace(/^\s+|\s+$/g,"")}function T(){var e=Array.isArray(arguments[0])?arguments[0]:arguments;return this.replace(/{(\d+)}/g,function(t,a){return"undefined"!=typeof e[a]?e[a]:t})}function F(e){var t=Array.isArray(arguments[1])?arguments[1]:Array.prototype.slice.call(arguments,1);return e.replace(/{(\d+)}/g,function(e,a){return"undefined"!=typeof t[a]?t[a]:e})}function k(e,t,a){var r=!0,n=r=!1;if(e instanceof Date?n=!0:(regex=new RegExp(t.pattern),n=(!t.pattern||"/\\S+/"===t.pattern.toString()||a&&"required"===t.pattern)&&null===e?!1:regex.test(e)),n){var i=t.dateType,o=e instanceof Date?e:w(e,i).getTime();if(2==t.params.length){var s=w(t.params[0],i).getTime(),l=w(t.params[1],i).getTime(),m=E(t.condition[0],o,s),u=E(t.condition[1],o,l);r=m&&u?!0:!1}else{var p=w(t.params[0],i).getTime();r=E(t.condition,o,p)}}return r}function L(e,t){var a=!0;if(2==t.params.length){var r=E(t.condition[0],parseFloat(e),parseFloat(t.params[0])),n=E(t.condition[1],parseFloat(e),parseFloat(t.params[1]));a=r&&n?!0:!1}else a=E(t.condition,parseFloat(e),parseFloat(t.params[0]));return a}function q(e,a,r,n,i,o){var s=!0,l="Custom Javascript Validation requires an error message defined as 'alt=' in your validator or defined in your custom javascript function as { isValid: bool, message: 'your error' }",m="Custom Javascript Validation requires a declared function (in your Controller), please review your code.";if(e){var u=null,p=a.params[0];if(-1===p.indexOf("."))u=r.scope[p];else{var d=p.split(".");u=r.scope;for(var c=0,f=d.length;f>c;c++)u=u[d[c]]}var g="function"==typeof u?u():null;if("boolean"==typeof g)s=g?!0:!1;else{if("object"!=typeof g)throw m;s=g.isValid?!0:!1}if(s===!1?(n.isValid=!1,t(function(){var e=o.message+" ";if(g.message&&(e+=g.message)," "===e)throw l;b(r,n,e,!1,i)})):s===!0&&(n.isValid=!0,b(r,n,"",!0,i)),"undefined"==typeof g)throw m}return s}function C(e,t,r,n){var i=!0,s=t.params[0],l=r.scope.$eval(s),m=angular.element(document.querySelector('[name="'+s+'"]')),u=t,p=r.ctrl,d=o(r.ctrl.$name);return i=E(t.condition,e,l)&&!!e,m&&m.attr("friendly-name")?t.params[1]=m.attr("friendly-name"):t.params.length>1&&(t.params[1]=t.params[1]),r.scope.$watch(s,function(e,t){var i=E(u.condition,p.$viewValue,e);if(e!==t){if(i)b(r,d,"",!0,!0);else{d.isValid=!1;var o=u.message;u.altText&&u.altText.length>0&&(o=u.altText.replace("alt=","")),a(o).then(function(e){n.message=" "+(u&&u.params?String.format(e,u.params):e),b(r,d,n.message,i,!0)})}p.$setValidity("validation",i)}},!0),i}function U(e,t,a,r,n,i){var o=!0,s="Remote Javascript Validation requires an error message defined as 'alt=' in your validator or defined in your custom remote function as { isValid: bool, message: 'your error' }",l="Remote Validation requires a declared function (in your Controller) which also needs to return a Promise, please review your code.";if(e&&n){a.ctrl.$processing=!0;var m=null,u=t.params[0];if(-1===u.indexOf("."))m=a.scope[u];else{var p=u.split(".");m=a.scope;for(var d=0,c=p.length;c>d;d++)m=m[p[d]]}var f="function"==typeof m?m():null;if(I.length>1)for(;I.length>0;){var g=I.pop();"function"==typeof g.abort&&g.abort()}if(I.push(f),!f||"function"!=typeof f.then)throw l;a.ctrl.$setValidity("remote",!1),function(e){f.then(function(t){t=t.data||t,I.pop(),a.ctrl.$processing=!1;var m=i.message+" ";if("boolean"==typeof t)o=t?!0:!1;else{if("object"!=typeof t)throw l;o=t.isValid?!0:!1}if(o===!1){if(r.isValid=!1,m+=t.message||e," "===m)throw s;b(a,r,m,!1,n)}else o===!0&&(r.isValid=!0,a.ctrl.$setValidity("remote",!0),b(a,r,"",!0,n))})}(t.altText)}return o}function j(e,t,a,r){var n=!0,i=r.attrs?r.attrs.ngDisabled:r.validatorAttrs.ngDisabled;return r.elm.prop("disabled")||r.scope.$eval(i)?n=!0:"string"==typeof e&&""===e&&r.elm.prop("type")&&"NUMBER"===r.elm.prop("type").toUpperCase()?n=!1:(regex=new RegExp(t.pattern,t.patternFlag),n=(!t.pattern||"/\\S+/"===t.pattern.toString()||a&&"required"===t.pattern)&&null===e?!1:regex.test(e)),n}function G(e,t){return V(t)?{condition:e.conditionNum,message:e.messageNum,params:e.params,type:"conditionalNumber"}:{pattern:e.patternLength,message:e.messageLength,params:e.params,type:"regex"}}var D=1e3,M=[],P={resetGlobalOptionsOnRouteChange:!0},I=[],H=[];e.$on("$routeChangeStart",function(){P.resetGlobalOptionsOnRouteChange&&(P={displayOnlyLastErrorMsg:!1,preValidateFormElements:!1,isolatedScope:null,scope:null,resetGlobalOptionsOnRouteChange:!0},M=[],H=[])});var _=function(e,t,a,r){this.bFieldRequired=!1,this.validators=[],this.typingLimit=D,this.scope=e,this.elm=t,this.ctrl=r,this.validatorAttrs=a,e&&e.$validationOptions&&(P=e.$validationOptions),e&&(P.isolatedScope||P.scope)&&(this.scope=P.isolatedScope||P.scope,P=p(e.$validationOptions,P)),"undefined"==typeof P.resetGlobalOptionsOnRouteChange&&(P.resetGlobalOptionsOnRouteChange=!0),this.elm&&this.validatorAttrs&&this.ctrl&&this.scope&&(y(this.elm,this.validatorAttrs,this.ctrl,this.scope),this.defineValidation())};return _.prototype.addToValidationSummary=n,_.prototype.arrayFindObject=$,_.prototype.defineValidation=i,_.prototype.getFormElementByName=o,_.prototype.getFormElements=s,_.prototype.getGlobalOptions=l,_.prototype.isFieldRequired=u,_.prototype.initialize=m,_.prototype.mergeObjects=p,_.prototype.removeFromValidationSummary=c,_.prototype.removeFromFormElementObjectList=d,_.prototype.setDisplayOnlyLastErrorMsg=f,_.prototype.setGlobalOptions=g,_.prototype.updateErrorMsg=v,_.prototype.validate=h,String.prototype.trim=R,String.prototype.format=T,String.format=F,_}]); +angular.module("ghiscoding.validation",["pascalprecht.translate"]).directive("validation",["$q","$timeout","validationCommon",function(a,i,e){return{restrict:"A",require:"ngModel",link:function(n,t,r,l){function o(e,r){var o=a.defer(),d=!1,m="undefined"!=typeof r?r:V.typingLimit,s=V.getFormElementByName(l.$name);if(Array.isArray(e)){if(E=[],$="",m=0,e.length>0)return"function"==typeof s.ctrl.$setTouched&&s.ctrl.$setTouched(),u(e,typeof e);m=0}return e&&e.badInput?v():(V.validate(e,!1),V.isFieldRequired()||""!==e&&null!==e&&"undefined"!=typeof e?(s&&(s.isValidationCancelled=!1),(e||V.isFieldRequired())&&l.$setValidity("validation",!1),"SELECT"===t.prop("tagName").toUpperCase()?(d=V.validate(e,!0),l.$setValidity("validation",d),o.resolve({isFieldValid:d,formElmObj:s,value:e}),o.promise):("undefined"!=typeof e&&(0===r?(d=V.validate(e,!0),n.$evalAsync(l.$setValidity("validation",d)),o.resolve({isFieldValid:d,formElmObj:s,value:e})):(V.updateErrorMsg(""),i.cancel(b),b=i(function(){d=V.validate(e,!0),n.$evalAsync(l.$setValidity("validation",d)),o.resolve({isFieldValid:d,formElmObj:s,value:e})},m))),o.promise)):(f(),o.resolve({isFieldValid:!0,formElmObj:s,value:e}),o.promise))}function d(a,i,e){var n=o(a,0);n&&"function"==typeof n.then&&(E.push(n),parseInt(i)===e-1&&E.forEach(function(a){a.then(function(a){switch(j){case"all":if(a.isFieldValid===!1){var i=V.getGlobalOptions();a.formElmObj.translatePromise.then(function(e){$.length>0&&i.displayOnlyLastErrorMsg?$="["+a.value+"] :: "+(a.formElmObj.validator&&a.formElmObj.validator.params?String.format(e,a.formElmObj.validator.params):e):$+=" ["+a.value+"] :: "+(a.formElmObj.validator&&a.formElmObj.validator.params?String.format(e,a.formElmObj.validator.params):e),V.updateErrorMsg($,{isValid:!1}),V.addToValidationSummary(a.formElmObj,$)})}break;case"one":default:a.isFieldValid===!0&&(l.$setValidity("validation",!0),f())}})}))}function m(a){var i=V.getFormElementByName(l.$name),e="undefined"!=typeof l.$modelValue?l.$modelValue:a.target.value;if(i.isValidationCancelled)l.$setValidity("validation",!0);else{var n=o(e,10);h&&V.runValidationCallbackOnPromise(n,h)}}function u(a,i){var e=a.length;if("string"===i)for(var n in a)d(a[n],n,e);else if("object"===i)for(var n in a)if(a.hasOwnProperty(n)){var t=a[n];for(var r in t)if(t.hasOwnProperty(r)){if(F&&r!==F)continue;d(t[r],n,e)}}}function s(){f(),V.removeFromValidationSummary(O);var a=V.arrayFindObject(g,"elmName",l.$name);a&&a.watcherHandler()}function f(){var a=V.getFormElementByName(l.$name);a&&(a.isValidationCancelled=!0),i.cancel(b),V.updateErrorMsg(""),l.$setValidity("validation",!0),p()}function v(){i.cancel(b);var a=V.getFormElementByName(l.$name);V.updateErrorMsg("INVALID_KEY_CHAR",{isValid:!1,translate:!0}),V.addToValidationSummary(a,"INVALID_KEY_CHAR",!0)}function c(){return!!t.prop("validity")&&t.prop("validity").badInput===!0}function y(){var a=l.$modelValue||"";Array.isArray(a)||l.$setValidity("validation",V.validate(a,!1));var i=V.getFormElementByName(l.$name);i&&(i.isValidationCancelled=!1),p(),t.bind("blur",m)}function p(){"function"==typeof m&&t.unbind("blur",m)}var b,V=new e(n,t,r,l),$="",E=[],g=[],O=r.name,h=r.hasOwnProperty("validationCallback")?r.validationCallback:null,j=r.hasOwnProperty("validArrayRequireHowMany")?r.validArrayRequireHowMany:"one",F=r.hasOwnProperty("validationArrayObjprop")?r.validationArrayObjprop:null,A=n.$watch(function(){return c()?{badInput:!0}:l.$modelValue},function(a){if(a&&a.badInput)return p(),v();var i=o(a);h&&V.runValidationCallbackOnPromise(i,h)},!0);g.push({elmName:O,watcherHandler:A}),r.$observe("disabled",function(a){a?(f(),V.removeFromValidationSummary(O)):y()}),t.on("$destroy",function(){s()}),n.$watch(function(){return t.attr("validation")},function(a){"undefined"==typeof a||""===a?s():(V.defineValidation(),y())}),t.bind("blur",m)}}}]); +angular.module("ghiscoding.validation").factory("validationCommon",["$rootScope","$timeout","$translate","validationRules",function(e,t,a,r){function n(e,t,r){if("undefined"!=typeof e&&null!=e){var n=e.ctrl&&e.ctrl.$name?e.ctrl.$name:e.attrs&&e.attrs.name?e.attrs.name:e.elm.attr("name"),i=x(n,e),o=V(B,"field",n);if(o>=0&&""===t)B.splice(o,1);else if(""!==t){r&&(t=a.instant(t));var s=e.attrs&&e.friendlyName?a.instant(e.friendlyName):"",l={field:n,friendlyName:s,message:t,formName:i?i.$name:null};o>=0?B[o]=l:B.push(l)}if(e.scope.$validationSummary=B,i&&(i.$validationSummary=A(B,"formName",i.$name)),H&&H.controllerAs&&(H.controllerAs.$validationSummary=B,i&&i.$name)){var u=i.$name.indexOf(".")>=0?i.$name.split(".")[1]:i.$name,m=H.controllerAs[u]?H.controllerAs[u]:e.elm.controller()[u];m&&(m.$validationSummary=A(B,"formName",i.$name))}return B}}function i(){var e=this,t={};e.validators=[],e.typingLimit=I,e.validatorAttrs.hasOwnProperty("debounce")?e.typingLimit=parseInt(e.validatorAttrs.debounce,10):e.validatorAttrs.hasOwnProperty("typingLimit")?e.typingLimit=parseInt(e.validatorAttrs.typingLimit,10):H&&H.hasOwnProperty("debounce")&&(e.typingLimit=parseInt(H.debounce,10));var a=e.validatorAttrs.rules||e.validatorAttrs.validation;if(a.indexOf("pattern=/")>=0){var n=a.match(/pattern=(\/.*\/[igm]*)(:alt=(.*))?/);if(!n||n.length<3)throw'Regex validator within the validation needs to be define with an opening "/" and a closing "/", please review your validator.';var i=n[1],o=n[2]?n[2].replace(/\|(.*)/,""):"",s=i.match(new RegExp("^/(.*?)/([gimy]*)$")),l=new RegExp(s[1],s[2]);t={altMsg:o,message:o.replace(/:alt=/,""),pattern:l},a=a.replace("pattern="+i,"pattern")}else if(a.indexOf("regex:")>=0){var n=a.match("regex:(.*?):regex");if(n.length<2)throw'Regex validator within the validation needs to be define with an opening "regex:" and a closing ":regex", please review your validator.';var u=n[1].split(":=");t={message:u[0],pattern:u[1]},a=a.replace(n[0],"regex:")}var m=a.split("|");if(m){e.bFieldRequired=a.indexOf("required")>=0;for(var p=0,d=m.length;d>p;p++){var c=m[p].split(":"),f=m[p].indexOf("alt=")>=0;e.validators[p]=r.getElementValidators({altText:f===!0?2===c.length?c[1]:c[2]:"",customRegEx:t,rule:c[0],ruleParams:f&&2===c.length?null:c[1]})}}return e}function o(e){return S(P,"fieldName",e)}function s(e){return e?A(P,"formName",e):P}function l(){return H}function u(e,t,a,r){this.scope=e,this.elm=t,this.ctrl=r,this.validatorAttrs=a,$(t,a,r,e),this.defineValidation()}function m(){var e=this;return e.bFieldRequired}function p(e,t){var a={};for(var r in e)a[r]=e[r];for(var r in t)a[r]=t[r];return a}function d(e){var t=V(P,"fieldName",e);t>=0&&P.splice(t,1)}function c(e,t){var a=this,r=x(e,a),n=t||B,i=V(n,"field",e);if(i>=0&&n.splice(i,1),i=V(B,"field",e),i>=0&&B.splice(i,1),a.scope.$validationSummary=B,r&&(r.$validationSummary=A(B,"formName",r.$name)),H&&H.controllerAs&&(H.controllerAs.$validationSummary=B,r)){var o=r.$name.indexOf(".")>=0?r.$name.split(".")[1]:r.$name;H.controllerAs[o]&&(H.controllerAs[o].$validationSummary=A(B,"formName",r.$name))}return B}function f(e,t){var a;if(/\({1}.*\){1}/gi.test(t))a=e.scope.$eval(t);else{var r=w(e.scope,t,".");"function"==typeof r&&(a=r())}return a}function g(e,t){var a=this;"function"==typeof e.then&&e.then(function(){f(a,t)})}function v(e){H.displayOnlyLastErrorMsg=e}function h(e){var t=this;return H=p(H,e),t}function y(e,t){var r=this;t&&t.obj&&(r=t.obj,r.validatorAttrs=t.obj.attrs);var n=t&&t.elm?t.elm:r.elm,i=n&&n.attr("name")?n.attr("name"):null;if("undefined"==typeof i||null===i){var o=n?n.attr("ng-model"):"unknown";throw'Angular-Validation Service requires you to have a (name="") attribute on the element to validate... Your element is: ng-model="'+o+'"'}var s=t&&t.translate?a.instant(e):e,l=i.replace(/[|&;$%@"<>()+,\[\]\{\}]/g,""),u=null;if(r.validatorAttrs&&r.validatorAttrs.hasOwnProperty("validationErrorTo")){var m=r.validatorAttrs.validationErrorTo.charAt(0),p="."===m||"#"===m?r.validatorAttrs.validationErrorTo:"#"+r.validatorAttrs.validationErrorTo;u=angular.element(document.querySelector(p))}u&&0!==u.length||(u=angular.element(document.querySelector(".validation-"+l)));var d=t&&t.isSubmitted?t.isSubmitted:!1;!H.hideErrorUnderInputs&&t&&!t.isValid&&(d||r.ctrl.$dirty||r.ctrl.$touched)?u.length>0?u.html(s):n.after(''+s+""):u.html("")}function b(e,t){var r,i=this,s=!0,l=!0,u={message:""};"undefined"==typeof e&&(e="");for(var m=i.ctrl&&i.ctrl.$name?i.ctrl.$name:i.attrs&&i.attrs.name?i.attrs.name:i.elm.attr("name"),p=o(m),d=i.validatorAttrs.rules||i.validatorAttrs.validation,c=0,f=i.validators.length;f>c;c++){r=i.validators[c],"autoDetect"===r.type&&(r=M(r,e));var g=i.attrs?i.attrs.ngDisabled:i.validatorAttrs.ngDisabled;switch(r.type){case"conditionalDate":s=q(e,r,d);break;case"conditionalNumber":s=U(e,r);break;case"javascript":s=C(e,r,i,p,t,u);break;case"matching":s=j(e,r,i,u);break;case"remote":s=G(e,r,i,p,t,u);break;default:s=D(e,r,d,i)}(!i.bFieldRequired&&!e||i.elm.prop("disabled")||i.scope.$eval(g))&&(s=!0),s||(l=!1,function(e,r,n){var o=n.message;n.altText&&n.altText.length>0&&(o=n.altText.replace("alt=",""));var s=a(o);e.translatePromise=s,e.validator=n,s.then(function(a){u.message.length>0&&H.displayOnlyLastErrorMsg?u.message=" "+(n&&n.params?String.format(a,n.params):a):u.message+=" "+(n&&n.params?String.format(a,n.params):a),O(i,e,u.message,l,t)})["catch"](function(){n.altText&&n.altText.length>0&&(u.message.length>0&&H.displayOnlyLastErrorMsg?u.message=" "+o:u.message+=" "+o,O(i,e,u.message,l,t))})}(p,s,r))}return s&&(n(i,""),i.updateErrorMsg("",{isValid:s})),p&&(p.isValid=l,l&&(p.message="")),l}function $(e,t,r,n){var i=t.name?t.name:e.attr("name"),o=x(i,{scope:n}),s=t&&t.friendlyName?a.instant(t.friendlyName):"",l={fieldName:i,friendlyName:s,elm:e,attrs:t,ctrl:r,scope:n,isValid:!1,message:"",formName:o?o.$name:null},u=V(P,"fieldName",e.attr("name"));return u>=0?P[u]=l:P.push(l),P}function O(e,t,a,r,i){a=a.trim(),t&&t.isValidationCancelled===!0&&(a=""),n(t,a),(e.validatorAttrs.preValidateFormElements||H.preValidateFormElements)&&(t&&"function"==typeof e.ctrl.$setTouched&&t.ctrl.$setTouched(),e.ctrl.$dirty===!1&&y(a,{isSubmitted:!0,isValid:r,obj:t})),i&&t&&!t.isValid?e.updateErrorMsg(a,{isValid:r,obj:t}):t&&t.isValid&&n(t,"")}function S(e,t,a){if(e)for(var r=0;r=0?w(t.scope,o,"."):t.scope[o]))return"undefined"==typeof a.$name&&(a.$name=o),a}if(i){var o=i?i.getAttribute("name"):null;if(o){var s={$name:o,specialNote:"Created by Angular-Validation for Isolated Scope usage"};if(H&&H.controllerAs&&o.indexOf(".")>=0){var l=o.split(".");return t.scope[l[0]][l[1]]=s}return t.scope[o]=s}}return null}function E(e){return!isNaN(parseFloat(e))&&isFinite(e)}function w(e,t,a){for(var r=a?t.split(a):t,n=0,i=r.length;i>n;n++)e[r[n]]&&(e=e[r[n]]);return e}function N(e,t){var a="",r="-",n=[],i=[],o="",s="",l="";switch(t.toUpperCase()){case"EURO_LONG":case"EURO-LONG":a=e.substring(0,10),r=e.substring(2,3),n=R(a,r),l=n[0],s=n[1],o=n[2],i=e.length>8?e.substring(9).split(":"):null;break;case"UK":case"EURO":case"EURO_SHORT":case"EURO-SHORT":case"EUROPE":a=e.substring(0,8),r=e.substring(2,3),n=R(a,r),l=n[0],s=n[1],o=parseInt(n[2])<50?"20"+n[2]:"19"+n[2],i=e.length>8?e.substring(9).split(":"):null;break;case"US_LONG":case"US-LONG":a=e.substring(0,10),r=e.substring(2,3),n=R(a,r),s=n[0],l=n[1],o=n[2],i=e.length>8?e.substring(9).split(":"):null;break;case"US":case"US_SHORT":case"US-SHORT":a=e.substring(0,8),r=e.substring(2,3),n=R(a,r),s=n[0],l=n[1],o=parseInt(n[2])<50?"20"+n[2]:"19"+n[2],i=e.length>8?e.substring(9).split(":"):null;break;case"ISO":default:a=e.substring(0,10),r=e.substring(4,5),n=R(a,r),o=n[0],s=n[1],l=n[2],i=e.length>10?e.substring(11).split(":"):null}var u=i&&3===i.length?i[0]:0,m=i&&3===i.length?i[1]:0,p=i&&3===i.length?i[2]:0;return new Date(o,s-1,l,u,m,p)}function R(e,t){var a=[];switch(t){case"/":a=e.split("/");break;case".":a=e.split(".");break;case"-":default:a=e.split("-")}return a}function T(e,t,a){var r=!1;switch(e){case"<":r=a>t;break;case"<=":r=a>=t;break;case">":r=t>a;break;case">=":r=t>=a;break;case"!=":case"<>":r=t!=a;break;case"!==":r=t!==a;break;case"=":case"==":r=t==a;break;case"===":r=t===a;break;default:r=!1}return r}function F(){return this.replace(/^\s+|\s+$/g,"")}function k(){var e=Array.isArray(arguments[0])?arguments[0]:arguments;return this.replace(/{(\d+)}/g,function(t,a){return"undefined"!=typeof e[a]?e[a]:t})}function L(e){var t=Array.isArray(arguments[1])?arguments[1]:Array.prototype.slice.call(arguments,1);return e.replace(/{(\d+)}/g,function(e,a){return"undefined"!=typeof t[a]?t[a]:e})}function q(e,t,a){var r=!0,n=r=!1;if(e instanceof Date?n=!0:(regex=new RegExp(t.pattern),n=(!t.pattern||"/\\S+/"===t.pattern.toString()||a&&"required"===t.pattern)&&null===e?!1:regex.test(e)),n){var i=t.dateType,o=e instanceof Date?e:N(e,i).getTime();if(2==t.params.length){var s=N(t.params[0],i).getTime(),l=N(t.params[1],i).getTime(),u=T(t.condition[0],o,s),m=T(t.condition[1],o,l);r=u&&m}else{var p=N(t.params[0],i).getTime();r=T(t.condition,o,p)}}return r}function U(e,t){var a=!0;if(2==t.params.length){var r=T(t.condition[0],parseFloat(e),parseFloat(t.params[0])),n=T(t.condition[1],parseFloat(e),parseFloat(t.params[1]));a=r&&n}else a=T(t.condition,parseFloat(e),parseFloat(t.params[0]));return a}function C(e,a,r,n,i,o){var s=!0,l="Custom Javascript Validation requires an error message defined as 'alt=' in your validator or defined in your custom javascript function as { isValid: bool, message: 'your error' }",u="Custom Javascript Validation requires a declared function (in your Controller), please review your code.";if(e){var m=a.params[0],p=f(r,m);if("boolean"==typeof p)s=!!p;else{if("object"!=typeof p)throw u;s=!!p.isValid}if(s===!1?(n.isValid=!1,t(function(){var e=o.message+" ";if(p.message&&(e+=p.message)," "===e)throw l;O(r,n,e,!1,i)})):s===!0&&(n.isValid=!0,O(r,n,"",!0,i)),"undefined"==typeof p)throw u}return s}function j(e,t,r,n){var i=!0,s=t.params[0],l=r.scope.$eval(s),u=angular.element(document.querySelector('[name="'+s+'"]')),m=t,p=r.ctrl,d=o(r.ctrl.$name);return i=T(t.condition,e,l)&&!!e,u&&u.attr("friendly-name")?t.params[1]=u.attr("friendly-name"):t.params.length>1&&(t.params[1]=t.params[1]),r.scope.$watch(s,function(e,t){var i=T(m.condition,p.$viewValue,e);if(e!==t){if(i)O(r,d,"",!0,!0);else{d.isValid=!1;var o=m.message;m.altText&&m.altText.length>0&&(o=m.altText.replace("alt=","")),a(o).then(function(e){n.message=" "+(m&&m.params?String.format(e,m.params):e),O(r,d,n.message,i,!0)})}p.$setValidity("validation",i)}},!0),i}function G(e,t,a,r,n,i){var o=!0,s="Remote Javascript Validation requires an error message defined as 'alt=' in your validator or defined in your custom remote function as { isValid: bool, message: 'your error' }",l="Remote Validation requires a declared function (in your Controller) which also needs to return a Promise, please review your code.";if(e&&n){a.ctrl.$processing=!0;var u=t.params[0],m=f(a,u);if(_.length>1)for(;_.length>0;){var p=_.pop();"function"==typeof p.abort&&p.abort()}if(_.push(m),!m||"function"!=typeof m.then)throw l;a.ctrl.$setValidity("remote",!1),function(e){m.then(function(t){t=t.data||t,_.pop(),a.ctrl.$processing=!1;var u=i.message+" ";if("boolean"==typeof t)o=!!t;else{if("object"!=typeof t)throw l;o=!!t.isValid}if(o===!1){if(r.isValid=!1,u+=t.message||e," "===u)throw s;O(a,r,u,!1,n)}else o===!0&&(r.isValid=!0,a.ctrl.$setValidity("remote",!0),O(a,r,"",!0,n))})}(t.altText)}return o}function D(e,t,a,r){var n=!0,i=r.attrs?r.attrs.ngDisabled:r.validatorAttrs.ngDisabled;return r.elm.prop("disabled")||r.scope.$eval(i)?n=!0:"string"==typeof e&&""===e&&r.elm.prop("type")&&"NUMBER"===r.elm.prop("type").toUpperCase()?n=!1:(regex=new RegExp(t.pattern,t.patternFlag),n=(!t.pattern||"/\\S+/"===t.pattern.toString()||a&&"required"===t.pattern)&&null===e?!1:regex.test(e)),n}function M(e,t){return E(t)?{condition:e.conditionNum,message:e.messageNum,params:e.params,type:"conditionalNumber"}:{pattern:e.patternLength,message:e.messageLength,params:e.params,type:"regex"}}var I=1e3,P=[],H={resetGlobalOptionsOnRouteChange:!0},_=[],B=[];e.$on("$routeChangeStart",function(){H.resetGlobalOptionsOnRouteChange&&(H={displayOnlyLastErrorMsg:!1,hideErrorUnderInputs:!1,preValidateFormElements:!1,isolatedScope:null,scope:null,resetGlobalOptionsOnRouteChange:!0},P=[],B=[])});var J=function(e,t,a,r){this.bFieldRequired=!1,this.validators=[],this.typingLimit=I,this.scope=e,this.elm=t,this.ctrl=r,this.validatorAttrs=a,e&&e.$validationOptions&&(H=e.$validationOptions),e&&(H.isolatedScope||H.scope)&&(this.scope=H.isolatedScope||H.scope,H=p(e.$validationOptions,H)),"undefined"==typeof H.resetGlobalOptionsOnRouteChange&&(H.resetGlobalOptionsOnRouteChange=!0),this.elm&&this.validatorAttrs&&this.ctrl&&this.scope&&($(this.elm,this.validatorAttrs,this.ctrl,this.scope),this.defineValidation())};return J.prototype.addToValidationSummary=n,J.prototype.arrayFindObject=S,J.prototype.defineValidation=i,J.prototype.getFormElementByName=o,J.prototype.getFormElements=s,J.prototype.getGlobalOptions=l,J.prototype.isFieldRequired=m,J.prototype.initialize=u,J.prototype.mergeObjects=p,J.prototype.removeFromValidationSummary=c,J.prototype.removeFromFormElementObjectList=d,J.prototype.runValidationCallbackOnPromise=g,J.prototype.setDisplayOnlyLastErrorMsg=v,J.prototype.setGlobalOptions=h,J.prototype.updateErrorMsg=y,J.prototype.validate=b,String.prototype.trim=F,String.prototype.format=k,String.format=L,J}]); angular.module("ghiscoding.validation").factory("validationRules",[function(){function e(e){var a="undefined"!=typeof e.altText?e.altText.replace("alt=",""):null,t=e.hasOwnProperty("customRegEx")?e.customRegEx:null,s=e.hasOwnProperty("rule")?e.rule:null,n=e.hasOwnProperty("ruleParams")?e.ruleParams:null,r={};switch(s){case"accepted":r={pattern:/^(yes|on|1|true)$/i,message:"INVALID_ACCEPTED",type:"regex"};break;case"alpha":r={pattern:/^([a-zа-яàáâãäåæçèéêëœìíïîðòóôõöøùúûñüýÿßÞďđ])+$/i,message:"INVALID_ALPHA",type:"regex"};break;case"alphaSpaces":case"alpha_spaces":r={pattern:/^([a-zа-яàáâãäåæçèéêëœìíïîðòóôõöøùúûñüýÿßÞďđ\s])+$/i,message:"INVALID_ALPHA_SPACE",type:"regex"};break;case"alphaNum":case"alpha_num":r={pattern:/^([a-zа-яàáâãäåæçèéêëœìíïîðòóôõöøùúûñüýÿßÞďđ0-9])+$/i,message:"INVALID_ALPHA_NUM",type:"regex"};break;case"alphaNumSpaces":case"alpha_num_spaces":r={pattern:/^([a-zа-яàáâãäåæçèéêëœìíïîðòóôõöøùúûñüýÿßÞďđ0-9\s])+$/i,message:"INVALID_ALPHA_NUM_SPACE",type:"regex"};break;case"alphaDash":case"alpha_dash":r={pattern:/^([a-zа-яàáâãäåæçèéêëœìíïîðòóôõöøùúûñüýÿßÞďđ0-9_-])+$/i,message:"INVALID_ALPHA_DASH",type:"regex"};break;case"alphaDashSpaces":case"alpha_dash_spaces":r={pattern:/^([a-zа-яàáâãäåæçèéêëœìíïîðòóôõöøùúûñüýÿßÞďđ0-9\s_-])+$/i,message:"INVALID_ALPHA_DASH_SPACE",type:"regex"};break;case"between":var _=n.split(",");if(2!==_.length)throw"This validation must include exactly 2 params separated by a comma (,) ex.: between:1,5";r={patternLength:"^(.|[\\r\\n]){"+_[0]+","+_[1]+"}$",messageLength:"INVALID_BETWEEN_CHAR",conditionNum:[">=","<="],messageNum:"INVALID_BETWEEN_NUM",params:[_[0],_[1]],type:"autoDetect"};break;case"betweenLen":case"between_len":var _=n.split(",");if(2!==_.length)throw"This validation must include exactly 2 params separated by a comma (,) ex.: between_len:1,5";r={pattern:"^(.|[\\r\\n]){"+_[0]+","+_[1]+"}$",message:"INVALID_BETWEEN_CHAR",params:[_[0],_[1]],type:"regex"};break;case"betweenNum":case"between_num":var _=n.split(",");if(2!==_.length)throw"This validation must include exactly 2 params separated by a comma (,) ex.: between_num:1,5";r={condition:[">=","<="],message:"INVALID_BETWEEN_NUM",params:[_[0],_[1]],type:"conditionalNumber"};break;case"boolean":r={pattern:/^(true|false|0|1)$/i,message:"INVALID_BOOLEAN",type:"regex"};break;case"checked":r={pattern:/^true$/i,message:"INVALID_CHECKBOX_SELECTED",type:"regex"};break;case"creditCard":case"credit_card":r={pattern:/^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|6(?:011|5[0-9]{2})[0-9]{12}|(?:2131|1800|35\d{3})\d{11})$/,message:"INVALID_CREDIT_CARD",type:"regex"};break;case"custom":case"javascript":r={message:"",params:[n],type:"javascript"};break;case"dateEuroLong":case"date_euro_long":r={pattern:/^(0[1-9]|[12][0-9]|3[01])[-\/\.](0[1-9]|1[012])[-\/\.](19|20)\d\d$/,message:"INVALID_DATE_EURO_LONG",type:"regex"};break;case"dateEuroLongBetween":case"date_euro_long_between":case"betweenDateEuroLong":case"between_date_euro_long":var _=n.split(",");if(2!==_.length)throw"This validation must include exactly 2 params separated by a comma (,) ex.: between_date_euro_long:01-01-1990,31-12-2015";r={condition:[">=","<="],dateType:"EURO_LONG",params:[_[0],_[1]],pattern:/^(0[1-9]|[12][0-9]|3[01])[-\/\.](0[1-9]|1[012])[-\/\.](19|20)\d\d$/,message:"INVALID_DATE_EURO_LONG_BETWEEN",type:"conditionalDate"};break;case"dateEuroLongMax":case"date_euro_long_max":case"maxDateEuroLong":case"max_date_euro_long":r={condition:"<=",dateType:"EURO_LONG",params:[n],pattern:/^(0[1-9]|[12][0-9]|3[01])[-\/\.](0[1-9]|1[012])[-\/\.](19|20)\d\d$/,message:"INVALID_DATE_EURO_LONG_MAX",type:"conditionalDate"};break;case"dateEuroLongMin":case"date_euro_long_min":case"minDateEuroLong":case"min_date_euro_long":r={condition:">=",dateType:"EURO_LONG",params:[n],pattern:/^(0[1-9]|[12][0-9]|3[01])[-\/\.](0[1-9]|1[012])[-\/\.](19|20)\d\d$/,message:"INVALID_DATE_EURO_LONG_MIN",type:"conditionalDate"};break;case"dateEuroShort":case"date_euro_short":r={pattern:/^(0[1-9]|[12][0-9]|3[01])[-\/\.](0[1-9]|1[012])[-\/\.]\d\d$/,message:"INVALID_DATE_EURO_SHORT",type:"regex"};break;case"dateEuroShortBetween":case"date_euro_short_between":case"betweenDateEuroShort":case"between_date_euro_short":var _=n.split(",");if(2!==_.length)throw"This validation must include exactly 2 params separated by a comma (,) ex.: between_date_euro_short:01-01-90,31-12-15";r={condition:[">=","<="],dateType:"EURO_SHORT",params:[_[0],_[1]],pattern:/^(0[1-9]|[12][0-9]|3[01])[-\/\.](0[1-9]|1[012])[-\/\.]\d\d$/,message:"INVALID_DATE_EURO_SHORT_BETWEEN",type:"conditionalDate"};break;case"dateEuroShortMax":case"date_euro_short_max":case"maxDateEuroShort":case"max_date_euro_short":r={condition:"<=",dateType:"EURO_SHORT",params:[n],pattern:/^(0[1-9]|[12][0-9]|3[01])[-\/\.](0[1-9]|1[012])[-\/\.]\d\d$/,message:"INVALID_DATE_EURO_SHORT_MAX",type:"conditionalDate"};break;case"dateEuroShortMin":case"date_euro_short_min":case"minDateEuroShort":case"min_date_euro_short":r={condition:">=",dateType:"EURO_SHORT",params:[n],pattern:/^(0[1-9]|[12][0-9]|3[01])[-\/\.](0[1-9]|1[012])[-\/\.]\d\d$/,message:"INVALID_DATE_EURO_SHORT_MIN",type:"conditionalDate"};break;case"dateIso":case"date_iso":r={pattern:/^(19|20)\d\d([-])(0[1-9]|1[012])\2(0[1-9]|[12][0-9]|3[01])$/,message:"INVALID_DATE_ISO",type:"regex"};break;case"dateIsoBetween":case"date_iso_between":case"betweenDateIso":case"between_date_iso":var _=n.split(",");if(2!==_.length)throw"This validation must include exactly 2 params separated by a comma (,) ex.: between_date_iso:1990-01-01,2000-12-31";r={condition:[">=","<="],dateType:"ISO",params:[_[0],_[1]],pattern:/^(19|20)\d\d([-])(0[1-9]|1[012])\2(0[1-9]|[12][0-9]|3[01])$/,message:"INVALID_DATE_ISO_BETWEEN",type:"conditionalDate"};break;case"dateIsoMax":case"date_iso_max":case"maxDateIso":case"max_date_iso":r={condition:"<=",dateType:"ISO",params:[n],pattern:/^(19|20)\d\d([-])(0[1-9]|1[012])\2(0[1-9]|[12][0-9]|3[01])$/,message:"INVALID_DATE_ISO_MAX",type:"conditionalDate"};break;case"dateIsoMin":case"date_iso_min":case"minDateIso":case"min_date_iso":r={condition:">=",dateType:"ISO",params:[n],pattern:/^(19|20)\d\d([-])(0[1-9]|1[012])\2(0[1-9]|[12][0-9]|3[01])$/,message:"INVALID_DATE_ISO_MIN",type:"conditionalDate"};break;case"dateUsLong":case"date_us_long":r={pattern:/^(0[1-9]|1[012])[-\/\.](0[1-9]|[12][0-9]|3[01])[-\/\.](19|20)\d\d$/,message:"INVALID_DATE_US_LONG",type:"regex"};break;case"dateUsLongBetween":case"date_us_long_between":case"betweenDateUsLong":case"between_date_us_long":var _=n.split(",");if(2!==_.length)throw"This validation must include exactly 2 params separated by a comma (,) ex.: between_date_us_long:01/01/1990,12/31/2015";r={condition:[">=","<="],dateType:"US_LONG",params:[_[0],_[1]],pattern:/^(0[1-9]|1[012])[-\/\.](0[1-9]|[12][0-9]|3[01])[-\/\.](19|20)\d\d$/,message:"INVALID_DATE_US_LONG_BETWEEN",type:"conditionalDate"};break;case"dateUsLongMax":case"date_us_long_max":case"maxDateUsLong":case"max_date_us_long":r={condition:"<=",dateType:"US_LONG",params:[n],pattern:/^(0[1-9]|1[012])[-\/\.](0[1-9]|[12][0-9]|3[01])[-\/\.](19|20)\d\d$/,message:"INVALID_DATE_US_LONG_MAX",type:"conditionalDate"};break;case"dateUsLongMin":case"date_us_long_min":case"minDateUsLong":case"min_date_us_long":r={condition:">=",dateType:"US_LONG",params:[n],pattern:/^(0[1-9]|1[012])[-\/\.](0[1-9]|[12][0-9]|3[01])[-\/\.](19|20)\d\d$/,message:"INVALID_DATE_US_LONG_MIN",type:"conditionalDate"};break;case"dateUsShort":case"date_us_short":r={pattern:/^(0[1-9]|1[012])[-\/\.](0[1-9]|[12][0-9]|3[01])[-\/\.]\d\d$/,message:"INVALID_DATE_US_SHORT",type:"regex"};break;case"dateUsShortBetween":case"date_us_short_between":case"betweenDateUsShort":case"between_date_us_short":var _=n.split(",");if(2!==_.length)throw"This validation must include exactly 2 params separated by a comma (,) ex.: between_date_us_short:01/01/90,12/31/15";r={condition:[">=","<="],dateType:"US_SHORT",params:[_[0],_[1]],pattern:/^(0[1-9]|1[012])[-\/\.](0[1-9]|[12][0-9]|3[01])[-\/\.]\d\d$/,message:"INVALID_DATE_US_SHORT_BETWEEN",type:"conditionalDate"};break;case"dateUsShortMax":case"date_us_short_max":case"maxDateUsShort":case"max_date_us_short":r={condition:"<=",dateType:"US_SHORT",params:[n],pattern:/^(0[1-9]|1[012])[-\/\.](0[1-9]|[12][0-9]|3[01])[-\/\.]\d\d$/,message:"INVALID_DATE_US_SHORT_MAX",type:"conditionalDate"};break;case"dateUsShortMin":case"date_us_short_min":case"minDateUsShort":case"min_date_us_short":r={condition:">=",dateType:"US_SHORT",params:[n],pattern:/^(0[1-9]|1[012])[-\/\.](0[1-9]|[12][0-9]|3[01])[-\/\.]\d\d$/,message:"INVALID_DATE_US_SHORT_MIN",type:"conditionalDate"};break;case"different":case"differentInput":case"different_input":var e=n.split(",");r={condition:"!=",message:"INVALID_INPUT_DIFFERENT",params:e,type:"matching"};break;case"digits":r={pattern:"^\\d{"+n+"}$",message:"INVALID_DIGITS",params:[n],type:"regex"};break;case"digitsBetween":case"digits_between":var _=n.split(",");if(2!==_.length)throw"This validation must include exactly 2 params separated by a comma (,) ex.: digits_between:1,5";r={pattern:"^\\d{"+_[0]+","+_[1]+"}$",message:"INVALID_DIGITS_BETWEEN",params:[_[0],_[1]],type:"regex"};break;case"email":r={pattern:/^[-\wа-яàáâãäåæçèéêëœìíïîðòóôõöøùúûñüýÿßÞďđ0-9#~!$%^&*_=+\/`\|}{\'?]+(\.[-\wа-яàáâãäåæçèéêëœìíïîðòóôõöøùúûñüýÿßÞďđ0-9#~!$%^&*_=+\/`\|}{\'?]+)*@([\wа-яàáâãäåæçèéêëœìíïîðòóôõöøùúûñüýÿßÞďđ0-9_][-\wа-яàáâãäåæçèéêëœìíïîðòóôõöøùúûñüýÿßÞďđ0-9_]*(\.[-\wа-яàáâãäåæçèéêëœìíïîðòóôõöøùúûñüýÿßÞďđ0-9_]+)*([\wа-яàáâãäåæçèéêëœìíïîðòóôõöøùúûñüýÿßÞďđ]+)|(\.[\wа-яàáâãäåæçèéêëœìíïîðòóôõöøùúûñüýÿßÞďđ]{2,6})|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i,message:"INVALID_EMAIL",type:"regex"};break;case"exactLen":case"exact_len":r={pattern:"^(.|[\\r\\n]){"+n+"}$",message:"INVALID_EXACT_LEN",params:[n],type:"regex"};break;case"float":r={pattern:/^\d*\.{1}\d+$/,message:"INVALID_FLOAT",type:"regex"};break;case"floatSigned":case"float_signed":r={pattern:/^[-+]?\d*\.{1}\d+$/,message:"INVALID_FLOAT_SIGNED",type:"regex"};break;case"iban":r={pattern:/^[a-zA-Z]{2}\d{2}\s?([0-9a-zA-Z]{4}\s?){4}[0-9a-zA-Z]{2}$/i,message:"INVALID_IBAN",type:"regex"};break;case"in":case"inList":case"in_list":var c=n.replace(/,/g,"|");r={pattern:"^(\\b("+c+")\\b)$",patternFlag:"i",message:"INVALID_IN_LIST",params:[n],type:"regex"};break;case"int":case"integer":r={pattern:/^\d+$/,message:"INVALID_INTEGER",type:"regex"};break;case"intSigned":case"integerSigned":case"int_signed":case"integer_signed":r={pattern:/^[+-]?\d+$/,message:"INVALID_INTEGER_SIGNED",type:"regex"};break;case"ip":case"ipv4":r={pattern:/^(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}$/,message:"INVALID_IPV4",type:"regex"};break;case"ipv6":r={pattern:/^(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$/i,message:"INVALID_IPV6",type:"regex"};break;case"match":case"matchInput":case"match_input":case"same":var e=n.split(",");r={condition:"===",message:"INVALID_INPUT_MATCH",params:e,type:"matching"};break;case"max":r={patternLength:"^(.|[\\r\\n]){0,"+n+"}$",messageLength:"INVALID_MAX_CHAR",conditionNum:"<=",messageNum:"INVALID_MAX_NUM",params:[n],type:"autoDetect"};break;case"maxLen":case"max_len":r={pattern:"^(.|[\\r\\n]){0,"+n+"}$",message:"INVALID_MAX_CHAR",params:[n],type:"regex"};break;case"maxNum":case"max_num":r={condition:"<=",message:"INVALID_MAX_NUM",params:[n],type:"conditionalNumber"};break;case"min":r={patternLength:"^(.|[\\r\\n]){"+n+",}$",messageLength:"INVALID_MIN_CHAR",conditionNum:">=",messageNum:"INVALID_MIN_NUM",params:[n],type:"autoDetect"};break;case"minLen":case"min_len":r={pattern:"^(.|[\\r\\n]){"+n+",}$",message:"INVALID_MIN_CHAR",params:[n],type:"regex"};break;case"minNum":case"min_num":r={condition:">=",message:"INVALID_MIN_NUM",params:[n],type:"conditionalNumber"};break;case"notIn":case"not_in":case"notInList":case"not_in_list":var c=n.replace(/,/g,"|");r={pattern:"^((?!\\b("+c+")\\b).)+$",patternFlag:"i",message:"INVALID_NOT_IN_LIST",params:[n],type:"regex"};break;case"numeric":r={pattern:/^\d*\.?\d+$/,message:"INVALID_NUMERIC",type:"regex"};break;case"numericSigned":case"numeric_signed":r={pattern:/^[-+]?\d*\.?\d+$/,message:"INVALID_NUMERIC_SIGNED",type:"regex"};break;case"pattern":case"regex":r={pattern:t.pattern,message:"INVALID_PATTERN",params:[t.message],type:"regex"};break;case"remote":r={message:"",params:[n],type:"remote"};break;case"required":r={pattern:/\S+/,message:"INVALID_REQUIRED",type:"regex"};break;case"size":r={patternLength:"^(.|[\\r\\n]){"+n+"}$",messageLength:"INVALID_EXACT_LEN",conditionNum:"==",messageNum:"INVALID_EXACT_NUM",params:[n],type:"autoDetect"};break;case"url":r={pattern:/^(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:\/~\+#]*[\w\-\@?^=%&\/~\+#])?/i,message:"INVALID_URL",type:"regex"};break;case"time":r={pattern:/^([01]?[0-9]|2[0-3]):[0-5][0-9](:[0-5][0-9])?$/,message:"INVALID_TIME",type:"regex"}}return r.altText=a,r}var a={getElementValidators:e};return a}]); -angular.module("ghiscoding.validation").service("validationService",["$interpolate","$timeout","validationCommon",function(e,o,t){function n(t,n,a){var i=this,m={};if("string"==typeof t&&"string"==typeof n?(m.elmName=t,m.rules=n,m.friendlyName="string"==typeof a?a:""):m=t,"object"!=typeof m||!m.hasOwnProperty("elmName")||!m.hasOwnProperty("rules")||!m.hasOwnProperty("scope")&&"undefined"==typeof i.validationAttrs.scope)throw"Angular-Validation-Service requires at least the following 3 attributes: {elmName, rules, scope}";var r=m.scope?m.scope:i.validationAttrs.scope;if(m.elm=angular.element(document.querySelector('[name="'+m.elmName+'"]')),"object"!=typeof m.elm||0===m.elm.length)return i;if(new RegExp("{{(.*?)}}").test(m.elmName)&&(m.elmName=e(m.elmName)(r)),m.name=m.elmName,i.validationAttrs.isolatedScope){var l=r.$validationOptions||null;r=i.validationAttrs.isolatedScope,l&&(r.$validationOptions=l)}m.elm.bind("blur",b=function(e){var o=i.commonObj.getFormElementByName(m.elmName);o&&!o.isValidationCancelled&&(i.commonObj.initialize(r,m.elm,m,m.ctrl),d(i,e.target.value,10))}),m=i.commonObj.mergeObjects(i.validationAttrs,m),y(i,r,m),m.elm.on("$destroy",function(){var e=i.commonObj.getFormElementByName(i.commonObj.ctrl.$name);e&&(s(i,e),i.commonObj.removeFromValidationSummary(m.name))});var c=r.$watch(function(){return m.ctrl=angular.element(m.elm).controller("ngModel"),f(i,m.elmName)?{badInput:!0}:m.ctrl.$modelValue},function(e,t){if(e&&e.badInput){var n=i.commonObj.getFormElementByName(m.elmName);return v(i,n),u(i,m.name)}if(void 0===e&&void 0!==t&&!isNaN(t))return o.cancel(i.timer),void i.commonObj.ctrl.$setValidity("validation",i.commonObj.validate("",!0));m.ctrl=angular.element(m.elm).controller("ngModel"),m.value=e,i.commonObj.initialize(r,m.elm,m,m.ctrl);var a="undefined"==typeof e||"number"==typeof e&&isNaN(e)?0:void 0;d(i,e,a)},!0);return O.push({elmName:m.elmName,watcherHandler:c}),i}function a(e){var o=this,t="",n=!0;if("undefined"==typeof e||"undefined"==typeof e.$validationSummary)throw"checkFormValidity() requires a valid Angular Form or $scope/vm object passed as argument to work properly, for example:: fn($scope) OR fn($scope.form1) OR fn(vm) OR fn(vm.form1)";for(var a=0,i=e.$validationSummary.length;i>a;a++)if(n=!1,t=e.$validationSummary[a].field){var m=o.commonObj.getFormElementByName(t);m&&m.elm&&m.elm.length>0&&("function"==typeof m.ctrl.$setTouched&&m.ctrl.$setTouched(),o.commonObj.updateErrorMsg(e.$validationSummary[a].message,{isSubmitted:!0,isValid:m.isValid,obj:m}))}return n}function i(e){var o=this;if("undefined"==typeof e||"undefined"==typeof e.$validationSummary)throw"clearInvalidValidatorsInSummary() requires a valid Angular Form or $scope/vm object passed as argument to work properly, for example:: fn($scope) OR fn($scope.form1) OR fn(vm) OR fn(vm.form1)";for(var t=[],n=0,a=e.$validationSummary.length;a>n;n++)t.push(e.$validationSummary[n].field);for(n=0,a=t.length;a>n;n++)t[n]&&(o.commonObj.removeFromFormElementObjectList(t[n]),o.commonObj.removeFromValidationSummary(t[n],e.$validationSummary))}function m(e,o){var t,n=this;if("undefined"==typeof e||"undefined"==typeof e.$validationSummary)throw"removeValidator() only works with Validation that were defined by the Service (not by the Directive) and requires a valid Angular Form or $scope/vm object passed as argument to work properly, for example:: fn($scope) OR fn($scope.form1) OR fn(vm) OR fn(vm.form1)";if(o instanceof Array)for(var a=0,i=o.length;i>a;a++)t=n.commonObj.getFormElementByName(o[a]),t.elm.removeAttr("validation"),p(n,t,e.$validationSummary);else o instanceof Object&&o.formElmObj?(t=o.formElmObj,t.elm.removeAttr("validation"),p(o.self,t,e.$validationSummary)):(t=n.commonObj.getFormElementByName(o),t.elm.removeAttr("validation"),p(n,t,e.$validationSummary));return n}function r(e,o){var t,n=this,o=o||{},a="undefined"!=typeof o.removeAllValidators?o.removeAllValidators:!1,i="undefined"!=typeof o.emptyAllInputValues?o.emptyAllInputValues:!1;if("undefined"==typeof e||"undefined"==typeof e.$name)throw"resetForm() requires a valid Angular Form object passed as argument to work properly (ex.: $scope.form1).";var r=n.commonObj.getFormElements(e.$name);if(r instanceof Array)for(var l=0,c=r.length;c>l;l++)t=r[l],i&&t.elm.val(null),a?m(e,{self:n,formElmObj:t}):("function"==typeof t.ctrl.$setUntouched&&t.ctrl.$setUntouched(),t.ctrl.$setPristine(),n.commonObj.updateErrorMsg("",{isValid:!1,obj:t}))}function l(e){var o=this,t="boolean"==typeof e?e:!0;o.commonObj.setDisplayOnlyLastErrorMsg(t)}function c(e){var o=this;return o.validationAttrs=e,o.commonObj.setGlobalOptions(e),o}function d(e,t,n){var a="undefined"!=typeof n?n:e.commonObj.typingLimit,i=e.commonObj.getFormElementByName(e.commonObj.ctrl.$name);return t&&t.badInput?u(e,attrs.name):(e.commonObj.validate(t,!1),e.commonObj.isFieldRequired()||""!==t&&null!==t&&"undefined"!=typeof t?(i.isValidationCancelled=!1,(e.commonObj.isFieldRequired()||t)&&e.commonObj.ctrl.$setValidity("validation",!1),""!==t&&"undefined"!=typeof t||"NUMBER"!==e.commonObj.elm.prop("type").toUpperCase()?"SELECT"===e.commonObj.elm.prop("tagName").toUpperCase()?(e.commonObj.ctrl.$setValidity("validation",e.commonObj.validate(t,!0)),t):("undefined"!=typeof t&&(0===n?e.commonObj.scope.$evalAsync(e.commonObj.ctrl.$setValidity("validation",e.commonObj.validate(t,!0))):(e.commonObj.updateErrorMsg(""),o.cancel(e.timer),e.timer=o(function(){e.commonObj.scope.$evalAsync(e.commonObj.ctrl.$setValidity("validation",e.commonObj.validate(t,!0)))},a))),t):(o.cancel(e.timer),e.commonObj.ctrl.$setValidity("validation",e.commonObj.validate(t,!0)),t)):(s(e,i),t))}function s(e,t){var n=t&&t.ctrl?t.ctrl:e.commonObj.ctrl;t&&(t.isValidationCancelled=!0),o.cancel(self.timer),n.$setValidity("validation",!0),e.commonObj.updateErrorMsg("",{isValid:!0,obj:t}),v(e,t)}function u(e,t){o.cancel(e.timer);var n=e.commonObj.getFormElementByName(t);e.commonObj.updateErrorMsg("INVALID_KEY_CHAR",{isValid:!1,translate:!0,obj:n}),e.commonObj.addToValidationSummary(n,"INVALID_KEY_CHAR",!0)}function f(e,o){var t=e.commonObj.getFormElementByName(o);return!!t&&!!t.elm.prop("validity")&&t.elm.prop("validity").badInput===!0}function p(e,o,t){var n=e.commonObj.scope?e.commonObj.scope:o.scope?o.scope:null;if("undefined"==typeof n)throw"removeValidator() requires a valid $scope object passed but unfortunately could not find it.";var a=e.commonObj.arrayFindObject(O,"elmName",o.fieldName);a&&a.watcherHandler(),o.isValidationCancelled=!0,o.isValid=!0,o.attrs.validation="",s(e,o),"function"==typeof o.ctrl.$setUntouched&&o.ctrl.$setUntouched(),e.commonObj.scope=n,o.ctrl.$setPristine(),e.commonObj.removeFromValidationSummary(o.fieldName,t)}function v(e,o){if(o.isValidationCancelled=!0,"function"==typeof b){var t=o&&o.elm?o.elm:e.commonObj.elm;t.unbind("blur",b)}}function y(e,t,n){t.$watch(function(){return"undefined"==typeof n.elm.attr("ng-disabled")?null:t.$eval(n.elm.attr("ng-disabled"))},function(a){if("undefined"==typeof a||null===a)return null;n.ctrl=angular.element(n.elm).controller("ngModel"),e.commonObj.initialize(t,n.elm,n,n.ctrl);var i=e.commonObj.getFormElementByName(n.name);o(function(){if(a)n.ctrl.$setValidity("validation",!0),e.commonObj.updateErrorMsg("",{isValid:!0,obj:i}),e.commonObj.removeFromValidationSummary(n.name);else{var o=n.ctrl.$viewValue||"";e.commonObj.initialize(t,n.elm,n,n.ctrl),n.ctrl.$setValidity("validation",e.commonObj.validate(o,!1)),i&&(i.isValidationCancelled=!1),n.elm.bind("blur",b=function(o){i&&!i.isValidationCancelled&&d(e,o.target.value,10)})}},0,!1),a&&("function"==typeof n.ctrl.$setUntouched&&n.ctrl.$setUntouched(),n.ctrl.$setValidity("validation",!0),e.commonObj.removeFromValidationSummary(n.name))})}var b,O=[],j=function(e){this.isValidationCancelled=!1,this.timer=null,this.validationAttrs={},this.commonObj=new t,e&&this.setGlobalOptions(e)};return j.prototype.addValidator=n,j.prototype.checkFormValidity=a,j.prototype.removeValidator=m,j.prototype.resetForm=r,j.prototype.setDisplayOnlyLastErrorMsg=l,j.prototype.setGlobalOptions=c,j.prototype.clearInvalidValidatorsInSummary=i,j}]); \ No newline at end of file +angular.module("ghiscoding.validation").service("validationService",["$interpolate","$q","$timeout","validationCommon",function(e,o,t,a){function n(o,a,n){var i=this,l={};if("string"==typeof o&&"string"==typeof a?(l.elmName=o,l.rules=a,l.friendlyName="string"==typeof n?n:""):l=o,"object"!=typeof l||!l.hasOwnProperty("elmName")||!l.hasOwnProperty("rules")||!l.hasOwnProperty("scope")&&"undefined"==typeof i.validationAttrs.scope)throw"Angular-Validation-Service requires at least the following 3 attributes: {elmName, rules, scope}";var m=l.scope?l.scope:i.validationAttrs.scope;if(l.elm=angular.element(document.querySelector('[name="'+l.elmName+'"]')),"object"!=typeof l.elm||0===l.elm.length)return i;if(new RegExp("{{(.*?)}}").test(l.elmName)&&(l.elmName=e(l.elmName)(m)),l.name=l.elmName,i.validationAttrs.isolatedScope){var r=m.$validationOptions||null;m=i.validationAttrs.isolatedScope,r&&(m.$validationOptions=r)}j=i.validationAttrs.hasOwnProperty("validationCallback")?i.validationAttrs.validationCallback:null,l.elm.bind("blur",O=function(e){var o=i.commonObj.getFormElementByName(l.elmName);if(o&&!o.isValidationCancelled){i.commonObj.initialize(m,l.elm,l,l.ctrl);var t=s(i,e.target.value,10);j&&i.commonObj.runValidationCallbackOnPromise(t,j)}}),l=i.commonObj.mergeObjects(i.validationAttrs,l),y(i,m,l),l.elm.on("$destroy",function(){var e=i.commonObj.getFormElementByName(i.commonObj.ctrl.$name);e&&(u(i,e),i.commonObj.removeFromValidationSummary(l.name))});var d=m.$watch(function(){return l.ctrl=angular.element(l.elm).controller("ngModel"),v(i,l.elmName)?{badInput:!0}:l.ctrl.$modelValue},function(e,o){if(e&&e.badInput){var a=i.commonObj.getFormElementByName(l.elmName);return b(i,a),f(i,l.name)}if(void 0===e&&void 0!==o&&!isNaN(o))return t.cancel(i.timer),void i.commonObj.ctrl.$setValidity("validation",i.commonObj.validate("",!0));l.ctrl=angular.element(l.elm).controller("ngModel"),l.value=e,i.commonObj.initialize(m,l.elm,l,l.ctrl);var n="undefined"==typeof e||"number"==typeof e&&isNaN(e)?0:void 0,r=s(i,e,n);j&&i.commonObj.runValidationCallbackOnPromise(r,j)},!0);return $.push({elmName:l.elmName,watcherHandler:d}),i}function i(e){var o=this,t="",a=!0;if("undefined"==typeof e||"undefined"==typeof e.$validationSummary)throw"checkFormValidity() requires a valid Angular Form or $scope/vm object passed as argument to work properly, for example:: fn($scope) OR fn($scope.form1) OR fn(vm) OR fn(vm.form1)";for(var n=0,i=e.$validationSummary.length;i>n;n++)if(a=!1,t=e.$validationSummary[n].field){var l=o.commonObj.getFormElementByName(t);l&&l.elm&&l.elm.length>0&&("function"==typeof l.ctrl.$setTouched&&l.ctrl.$setTouched(),o.commonObj.updateErrorMsg(e.$validationSummary[n].message,{isSubmitted:!0,isValid:l.isValid,obj:l}))}return a}function l(e){var o=this;if("undefined"==typeof e||"undefined"==typeof e.$validationSummary)throw"clearInvalidValidatorsInSummary() requires a valid Angular Form or $scope/vm object passed as argument to work properly, for example:: fn($scope) OR fn($scope.form1) OR fn(vm) OR fn(vm.form1)";for(var t=[],a=0,n=e.$validationSummary.length;n>a;a++)t.push(e.$validationSummary[a].field);for(a=0,n=t.length;n>a;a++)t[a]&&(o.commonObj.removeFromFormElementObjectList(t[a]),o.commonObj.removeFromValidationSummary(t[a],e.$validationSummary))}function m(e,o){var t,a=this;if("undefined"==typeof e||"undefined"==typeof e.$validationSummary)throw"removeValidator() only works with Validation that were defined by the Service (not by the Directive) and requires a valid Angular Form or $scope/vm object passed as argument to work properly, for example:: fn($scope) OR fn($scope.form1) OR fn(vm) OR fn(vm.form1)";if(o instanceof Array)for(var n=0,i=o.length;i>n;n++)t=a.commonObj.getFormElementByName(o[n]),t.elm.removeAttr("validation"),p(a,t,e.$validationSummary);else o instanceof Object&&o.formElmObj?(t=o.formElmObj,t.elm.removeAttr("validation"),p(o.self,t,e.$validationSummary)):(t=a.commonObj.getFormElementByName(o),t.elm.removeAttr("validation"),p(a,t,e.$validationSummary));return a}function r(e,o){var t,a=this,o=o||{},n="undefined"!=typeof o.removeAllValidators?o.removeAllValidators:!1,i="undefined"!=typeof o.emptyAllInputValues?o.emptyAllInputValues:!1;if("undefined"==typeof e||"undefined"==typeof e.$name)throw"resetForm() requires a valid Angular Form object passed as argument to work properly (ex.: $scope.form1).";var l=a.commonObj.getFormElements(e.$name);if(l instanceof Array)for(var r=0,d=l.length;d>r;r++)t=l[r],i&&t.elm.val(null),n?m(e,{self:a,formElmObj:t}):("function"==typeof t.ctrl.$setUntouched&&t.ctrl.$setUntouched(),t.ctrl.$setPristine(),a.commonObj.updateErrorMsg("",{isValid:!1,obj:t}))}function d(e){var o=this,t="boolean"==typeof e?e:!0;o.commonObj.setDisplayOnlyLastErrorMsg(t)}function c(e){var o=this;return o.validationAttrs=e,o.commonObj.setGlobalOptions(e),o}function s(e,a,n){var i=o.defer(),l=!1,m="undefined"!=typeof n?n:e.commonObj.typingLimit,r=e.commonObj.getFormElementByName(e.commonObj.ctrl.$name);return a&&a.badInput?f(e,attrs.name):(e.commonObj.validate(a,!1),e.commonObj.isFieldRequired()||""!==a&&null!==a&&"undefined"!=typeof a?(r.isValidationCancelled=!1,(e.commonObj.isFieldRequired()||a)&&e.commonObj.ctrl.$setValidity("validation",!1),""!==a&&"undefined"!=typeof a||"NUMBER"!==e.commonObj.elm.prop("type").toUpperCase()?"SELECT"===e.commonObj.elm.prop("tagName").toUpperCase()?(l=e.commonObj.validate(a,!0),e.commonObj.ctrl.$setValidity("validation",l),i.resolve({isFieldValid:l,formElmObj:r,value:a}),i.promise):("undefined"!=typeof a&&(0===n?(l=e.commonObj.validate(a,!0),e.commonObj.scope.$evalAsync(e.commonObj.ctrl.$setValidity("validation",l)),i.resolve({isFieldValid:l,formElmObj:r,value:a})):(e.commonObj.updateErrorMsg(""),t.cancel(e.timer),e.timer=t(function(){l=e.commonObj.validate(a,!0),e.commonObj.scope.$evalAsync(e.commonObj.ctrl.$setValidity("validation",l)),i.resolve({isFieldValid:l,formElmObj:r,value:a})},m))),i.promise):(t.cancel(e.timer),l=e.commonObj.validate(a,!0),i.resolve({isFieldValid:l,formElmObj:r,value:a}),i.promise)):(u(e,r),i.resolve({isFieldValid:!0,formElmObj:r,value:a}),i.promise))}function u(e,o){var a=o&&o.ctrl?o.ctrl:e.commonObj.ctrl;o&&(o.isValidationCancelled=!0),t.cancel(self.timer),a.$setValidity("validation",!0),e.commonObj.updateErrorMsg("",{isValid:!0,obj:o}),b(e,o)}function f(e,o){t.cancel(e.timer);var a=e.commonObj.getFormElementByName(o);e.commonObj.updateErrorMsg("INVALID_KEY_CHAR",{isValid:!1,translate:!0,obj:a}),e.commonObj.addToValidationSummary(a,"INVALID_KEY_CHAR",!0)}function v(e,o){var t=e.commonObj.getFormElementByName(o);return!!t&&!!t.elm.prop("validity")&&t.elm.prop("validity").badInput===!0}function p(e,o,t){var a=e.commonObj.scope?e.commonObj.scope:o.scope?o.scope:null;if("undefined"==typeof a)throw"removeValidator() requires a valid $scope object passed but unfortunately could not find it.";var n=e.commonObj.arrayFindObject($,"elmName",o.fieldName);n&&n.watcherHandler(),o.isValidationCancelled=!0,o.isValid=!0,o.attrs.validation="",u(e,o),"function"==typeof o.ctrl.$setUntouched&&o.ctrl.$setUntouched(),e.commonObj.scope=a,o.ctrl.$setPristine(),e.commonObj.removeFromValidationSummary(o.fieldName,t)}function b(e,o){if(o.isValidationCancelled=!0,"function"==typeof O){var t=o&&o.elm?o.elm:e.commonObj.elm;t.unbind("blur",O)}}function y(e,o,a){o.$watch(function(){return"undefined"==typeof a.elm.attr("ng-disabled")?null:o.$eval(a.elm.attr("ng-disabled"))},function(n){if("undefined"==typeof n||null===n)return null;a.ctrl=angular.element(a.elm).controller("ngModel"),e.commonObj.initialize(o,a.elm,a,a.ctrl);var i=e.commonObj.getFormElementByName(a.name);t(function(){if(n)a.ctrl.$setValidity("validation",!0),e.commonObj.updateErrorMsg("",{isValid:!0,obj:i}),e.commonObj.removeFromValidationSummary(a.name);else{var t=a.ctrl.$viewValue||"";e.commonObj.initialize(o,a.elm,a,a.ctrl),a.ctrl.$setValidity("validation",e.commonObj.validate(t,!1)),i&&(i.isValidationCancelled=!1),a.elm.bind("blur",O=function(o){if(i&&!i.isValidationCancelled){var t=s(e,o.target.value,10);j&&e.commonObj.runValidationCallbackOnPromise(t,j)}})}},0,!1),n&&("function"==typeof a.ctrl.$setUntouched&&a.ctrl.$setUntouched(),a.ctrl.$setValidity("validation",!0),e.commonObj.removeFromValidationSummary(a.name))})}var O,j,$=[],g=function(e){this.isValidationCancelled=!1,this.timer=null,this.validationAttrs={},this.commonObj=new a,e&&this.setGlobalOptions(e)};return g.prototype.addValidator=n,g.prototype.checkFormValidity=i,g.prototype.removeValidator=m,g.prototype.resetForm=r,g.prototype.setDisplayOnlyLastErrorMsg=d,g.prototype.setGlobalOptions=c,g.prototype.clearInvalidValidatorsInSummary=l,g}]); \ No newline at end of file diff --git a/more-examples/customRemote/app.js b/more-examples/customRemote/app.js new file mode 100644 index 0000000..9f720ee --- /dev/null +++ b/more-examples/customRemote/app.js @@ -0,0 +1,93 @@ +'use strict'; + +var myApp = angular.module('myApp', ['ghiscoding.validation', 'pascalprecht.translate', 'ui.bootstrap']); +// -- +// configuration +myApp.config(['$compileProvider', function ($compileProvider) { + $compileProvider.debugInfoEnabled(false); + }]) + .config(['$translateProvider', function ($translateProvider) { + $translateProvider.useStaticFilesLoader({ + prefix: '../../locales/validation/', + suffix: '.json' + }); + // load English ('en') table on startup + $translateProvider.preferredLanguage('en').fallbackLanguage('en'); + $translateProvider.useSanitizeValueStrategy('escapeParameters'); + }]); + +// -- +// Directive +myApp.controller('CtrlDirective', ['$q', 'validationService', function ($q, validationService) { + var vmd = this; + vmd.model = {}; + + // use the validationService only to declare the controllerAs syntax + var vs = new validationService({ controllerAs: vmd, debounce: 500 }); + + vmd.myRemoteValidation1 = function() { + var deferred = $q.defer(); + setTimeout(function() { + var isValid = (vmd.model.input1 === "abc") ? true : false; + deferred.resolve({ isValid: isValid, message: 'Returned error from promise.'}); + }, 500); + + return deferred.promise; + } + + vmd.myRemoteValidation2 = function() { + var deferred = $q.defer(); + setTimeout(function() { + var isValid = (vmd.model.input2 === "def") ? true : false; + deferred.resolve({ isValid: isValid, message: 'Returned error from promise.'}); + }, 500); + + return deferred.promise; + } + + vmd.submitForm = function() { + if(vs.checkFormValidity(vmd.form1)) { + alert('All good, proceed with submit...'); + } + } +}]); + +// -- +// Service +myApp.controller('CtrlService', ['$scope', '$q', 'validationService', function ($scope, $q, validationService) { + var vms = this; + vms.model = {}; + + // use the validationService only to declare the controllerAs syntax + var vs = new validationService({ controllerAs: vms, debounce: 500 }); + + vs.setGlobalOptions({ scope: $scope }) + .addValidator('input3', 'alpha|min_len:2|remote:vms.myRemoteValidation3():alt=Alternate error message.|required') + .addValidator('input4', 'alpha|min_len:2|remote:vms.myRemoteValidation4()|required'); + + vms.myRemoteValidation3 = function() { + var deferred = $q.defer(); + setTimeout(function() { + var isValid = (vms.model.input3 === "abc") ? true : false; + deferred.resolve({ isValid: isValid, message: 'Returned error from promise.'}); + }, 500); + + return deferred.promise; + } + + vms.myRemoteValidation4 = function() { + var deferred = $q.defer(); + setTimeout(function() { + var isValid = (vms.model.input4 === "def") ? true : false; + deferred.resolve({ isValid: isValid, message: 'Returned error from promise.'}); + }, 500); + + return deferred.promise; + } + + vms.submitForm = function() { + if(new validationService().checkFormValidity(vms.form2)) { + alert('All good, proceed with submit...'); + } + } +}]); \ No newline at end of file diff --git a/more-examples/customRemote/index.html b/more-examples/customRemote/index.html new file mode 100644 index 0000000..e2f61fd --- /dev/null +++ b/more-examples/customRemote/index.html @@ -0,0 +1,127 @@ + + + + + Angular-Validation with Remote Validation + + + + + +
+

Example of Angular-Validation with Remote Validation

+ +
+

Directive

+
+ +

ERRORS!

+
    +
  • {{ item.field }}: {{item.message}}
    • +
+
+ +
+
+

Type 'abc' for a valid answer

+ + + + + +
+
+
+

Type 'def' for a valid answer

+ + + + + + +
+
+ + +
+
+
+ +
+ +
+

Service

+
+ +

ERRORS!

+
    +
  • {{ item.field }}: {{item.message}}
    • +
+
+ +
+
+

Type 'abc' for a valid answer

+ + + + + +
+
+
+

Type 'def' for a valid answer

+ + + + + + +
+
+ + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/more-examples/customValidation/app.js b/more-examples/customValidation/app.js index 28354e5..5e6743a 100644 --- a/more-examples/customValidation/app.js +++ b/more-examples/customValidation/app.js @@ -49,7 +49,7 @@ myApp.controller('CtrlDirective', ['validationService', function (validationServ myApp.controller('CtrlService', ['$scope', 'validationService', function ($scope, validationService) { var vms = this; vms.model = {}; - //vms.model.input3 = 'a'; + // use the validationService only to declare the controllerAs syntax var vs = new validationService({ controllerAs: vms }); diff --git a/more-examples/customValidation/index.html b/more-examples/customValidation/index.html index 3bd002d..1dc871f 100644 --- a/more-examples/customValidation/index.html +++ b/more-examples/customValidation/index.html @@ -9,9 +9,9 @@
-
-

Example of Angular-Validation with Custom Javascript function

+

Example of Angular-Validation with Custom Javascript function

+

Directive

diff --git a/more-examples/validationCallback/app.js b/more-examples/validationCallback/app.js new file mode 100644 index 0000000..25b9007 --- /dev/null +++ b/more-examples/validationCallback/app.js @@ -0,0 +1,36 @@ +'use strict'; + +var myApp = angular.module('myApp', ['ngRoute', 'ngSanitize', 'ghiscoding.validation', 'pascalprecht.translate']); +myApp.config(['$compileProvider', '$locationProvider', '$routeProvider', function ($compileProvider, $locationProvider, $routeProvider) { + $compileProvider.debugInfoEnabled(false); + }]) +.config(['$translateProvider', function ($translateProvider) { + $translateProvider.useStaticFilesLoader({ + prefix: '../../locales/validation/', + suffix: '.json' + }); + // load English ('en') table on startup + $translateProvider.preferredLanguage('en').fallbackLanguage('en'); + $translateProvider.useSanitizeValueStrategy('escapeParameters'); + }]); + + + +myApp.controller('ctrlDirective', [function () { + var vmd = this; + + vmd.onChange = function(index) { + vmd.formValid1 = vmd.form1.$valid; + vmd.fullName1 = vmd.firstName1 + ' ' + vmd.lastName1; + return index; + } +}]); + +myApp.controller('ctrlService', [function () { + var vms = this; + + vms.onChange = function() { + vms.formValid2 = vms.form2.$valid; + vms.fullName2 = vms.firstName2 + ' ' + vms.lastName2; + } +}]); \ No newline at end of file diff --git a/more-examples/validationCallback/index.html b/more-examples/validationCallback/index.html new file mode 100644 index 0000000..0c71cff --- /dev/null +++ b/more-examples/validationCallback/index.html @@ -0,0 +1,82 @@ + + + + + + + + + +
+

Example of Validation Callback

+ +
+

Directive

+ +
+ + + + + +
+ + Callback results +
+ Form is valid: {{ vmd.formValid1 }} +
+
+ Full Name: {{ vmd.fullName1 }} +
+
+ +
+ +
+

Service

+ +
+ + + + + +
+ + Callback results +
+ Form is valid: {{ vms.formValid2 }} +
+
+ Full Name: {{ vms.fullName2 }} +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + diff --git a/package.json b/package.json index 8f40dac..a723271 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular-validation-ghiscoding", - "version": "1.4.13", + "version": "1.4.14", "author": "Ghislain B.", "description": "Angular-Validation Directive and Service (ghiscoding)", "main": "app.js", diff --git a/protractor/callback_spec.js b/protractor/callback_spec.js new file mode 100644 index 0000000..bc65537 --- /dev/null +++ b/protractor/callback_spec.js @@ -0,0 +1,104 @@ +describe('Angular-Validation Remote Validation Tests:', function () { + // global variables + var formElementNames = ['firstName1', 'lastName1', 'firstName2', 'lastName2']; + var firstNameElements = ['firstName1', 'firstName2']; + var lastNameElements = ['lastName1', 'lastName2']; + var firstNames = ['John', 'Doe']; + var lastNames = ['Jane', 'Smith']; + var errorMessages = [ + 'First name is required', + 'Last name is required', + 'First name is required', + 'Last name is required' + ] + var formIsValidBindings = ['vmd.formValid1', 'vms.formValid2']; + var fullNameBindings = ['vmd.fullName1', 'vms.fullName2']; + var errorFromPromise = 'Must be at least 2 characters. Returned error from promise.'; + var defaultErrorMessage = 'May only contain letters. Must be at least 2 characters. Field is required.'; + var errorTooShort = [ + 'Must be at least 2 characters. Alternate error message.', + 'Must be at least 2 characters. Returned error from custom function.', + 'Must be at least 2 characters. Alternate error message.', + 'Must be at least 2 characters. Returned error from custom function.' + ]; + var oneChar = ['a', 'd', 'a', 'd']; + var validInputTexts = ['abc', 'def', 'abc', 'def']; + + describe('When choosing `more-examples` Validation Callback', function () { + it('Should navigate to home page', function () { + browser.get('http://localhost/Github/angular-validation/more-examples/validationCallback/'); + + // Find the title element + var titleElement = element(by.css('h2')); + expect(titleElement.getText()).toEqual('Example of Validation Callback'); + }); + + it('Should check that both submit buttons are disabled', function() { + var elmSubmit1 = $('[name=btn_ngDisabled1]'); + expect(elmSubmit1.isEnabled()).toBe(false); + + var elmSubmit2 = $('[name=btn_ngDisabled2]'); + expect(elmSubmit2.isEnabled()).toBe(false); + }); + + it('Should click, blur on each form elements and error message should display on each of them', function () { + for (var i = 0, ln = formElementNames.length; i < ln; i++) { + var elmInput = $('[name=' + formElementNames[i] + ']'); + elmInput.click(); + elmInput.sendKeys(protractor.Key.TAB); + + var elmError = $('.validation-' + formElementNames[i]); + expect(elmError.getText()).toEqual(errorMessages[i]); + } + }); + + it('Should enter First Name on both forms and have undefined Last Name', function() { + for (var i = 0, ln = firstNames.length; i < ln; i++) { + var elmInput = $('[name=' + firstNameElements[i] + ']'); + elmInput.click(); + elmInput.sendKeys(firstNames[i]); + + // form should show invalid + var formValid = element(by.binding(formIsValidBindings[i])); + expect(formValid.getText()).toEqual('Form is valid: false'); + + // Full name should show the first name we just entered + undefined as last name + var fullName = element(by.binding(fullNameBindings[i])); + expect(fullName.getText()).toEqual('Full Name: ' + firstNames[i] + ' undefined'); + } + }); + + it('Should check that both submit buttons are disabled', function() { + var elmSubmit1 = $('[name=btn_ngDisabled1]'); + expect(elmSubmit1.isEnabled()).toBe(false); + + var elmSubmit2 = $('[name=btn_ngDisabled2]'); + expect(elmSubmit2.isEnabled()).toBe(false); + }); + + it('Should enter Last Name on both forms and have Full Name', function() { + for (var i = 0, ln = firstNames.length; i < ln; i++) { + var elmInput = $('[name=' + lastNameElements[i] + ']'); + elmInput.click(); + elmInput.sendKeys(lastNames[i]); + + // form should show invalid + var formValid = element(by.binding(formIsValidBindings[i])); + expect(formValid.getText()).toEqual('Form is valid: true'); + + // Full name should show the first name we just entered + undefined as last name + var fullName = element(by.binding(fullNameBindings[i])); + expect(fullName.getText()).toEqual('Full Name: ' + firstNames[i] + ' ' + lastNames[i]); + } + }); + + it('Should check that both submit buttons are now enabled', function() { + var elmSubmit1 = $('[name=btn_ngDisabled1]'); + expect(elmSubmit1.isEnabled()).toBe(true); + + var elmSubmit2 = $('[name=btn_ngDisabled2]'); + expect(elmSubmit2.isEnabled()).toBe(true); + }); + + }); +}); \ No newline at end of file diff --git a/protractor/conf.js b/protractor/conf.js index 5dba351..2068ede 100644 --- a/protractor/conf.js +++ b/protractor/conf.js @@ -22,7 +22,9 @@ // Spec patterns are relative to the current working directory when protractor is called specs: [ 'badInput_spec.js', + 'callback_spec.js', 'custom_spec.js', + 'remote_spec.js', 'mixed_validation_spec.js', 'angularUI_spec.js', 'dynamic_spec.js', diff --git a/protractor/custom_spec.js b/protractor/custom_spec.js index efb3b23..2b3c818 100644 --- a/protractor/custom_spec.js +++ b/protractor/custom_spec.js @@ -1,12 +1,7 @@ describe('Angular-Validation Custom Javascript Validation Tests:', function () { // global variables var formElementNames = ['input1', 'input2', 'input3', 'input4']; - var errorMessages = [ - 'May only contain letters. Must be at least 2 characters. Field is required.', - 'May only contain letters. Must be at least 2 characters. Field is required.', - 'May only contain letters. Must be at least 2 characters. Field is required.', - 'May only contain letters. Must be at least 2 characters. Field is required.' - ]; + var defaultErrorMessage = 'May only contain letters. Must be at least 2 characters. Field is required.'; var errorTooShort = [ 'Must be at least 2 characters. Alternate error message.', 'Must be at least 2 characters. Returned error from custom function.', @@ -18,7 +13,7 @@ describe('When choosing `more-examples` custom javascript', function () { it('Should navigate to home page', function () { - browser.get('http://localhost/Github/angular-validation/more-examples/customJavascript/'); + browser.get('http://localhost/Github/angular-validation/more-examples/customValidation/'); // Find the title element var titleElement = element(by.css('h2')); @@ -30,7 +25,7 @@ var inputName; for (var i = 0, j = 0, ln = itemRows.length; i < ln; i++) { - expect(itemRows.get(i).getText()).toEqual(defaultErrorMessages[i]); + expect(itemRows.get(i).getText()).toEqual(defaultErrorMessage); } }); @@ -49,7 +44,7 @@ elmInput.sendKeys(protractor.Key.TAB); var elmError = $('.validation-' + formElementNames[i]); - expect(elmError.getText()).toEqual(errorMessages[i]); + expect(elmError.getText()).toEqual(defaultErrorMessage); } }); @@ -91,7 +86,7 @@ }); it('Should navigate to home page', function () { - browser.get('http://localhost/Github/angular-validation/more-examples/customJavascript/'); + browser.get('http://localhost/Github/angular-validation/more-examples/customValidation/'); // Find the title element var titleElement = element(by.css('h2')); @@ -113,7 +108,7 @@ elmInput.sendKeys(protractor.Key.TAB); var elmError = $('.validation-' + formElementNames[i]); - expect(elmError.getText()).toEqual(errorMessages[i]); + expect(elmError.getText()).toEqual(defaultErrorMessage); } }); diff --git a/protractor/mixed_validation_spec.js b/protractor/mixed_validation_spec.js index 3537517..b96a0a7 100644 --- a/protractor/mixed_validation_spec.js +++ b/protractor/mixed_validation_spec.js @@ -145,7 +145,7 @@ elmInput.sendKeys('ab'); elmInput.sendKeys(protractor.Key.TAB); //$('[for=input1]').click(); - browser.sleep(1500); // sleep because of our data sample having a delay of 1sec internally, we use 1.5sec on this side to be sure + browser.sleep(1100); // sleep because of our data sample having a delay of 1sec internally, we use 1.5sec on this side to be sure var elmError = $('.validation-input1'); expect(elmError.getText()).toEqual('Returned error from promise.'); @@ -157,7 +157,7 @@ elmInput.sendKeys('abc'); elmInput.sendKeys(protractor.Key.TAB); //$('[for=input1]').click(); - browser.sleep(1500); // sleep because of our data sample having a delay of 1sec internally, we use 1.5sec on this side to be sure + browser.sleep(1100); // sleep because of our data sample having a delay of 1sec internally, we use 1.5sec on this side to be sure var elmError = $('.validation-input1'); expect(elmError.getText()).toEqual(''); diff --git a/protractor/remote_spec.js b/protractor/remote_spec.js new file mode 100644 index 0000000..a23e3ba --- /dev/null +++ b/protractor/remote_spec.js @@ -0,0 +1,130 @@ +describe('Angular-Validation Remote Validation Tests:', function () { + // global variables + var formElementNames = ['input1', 'input2', 'input3', 'input4']; + var errorFromPromise = 'Must be at least 2 characters. Returned error from promise.'; + var defaultErrorMessage = 'May only contain letters. Must be at least 2 characters. Field is required.'; + var errorTooShort = [ + 'Must be at least 2 characters. Alternate error message.', + 'Must be at least 2 characters. Returned error from custom function.', + 'Must be at least 2 characters. Alternate error message.', + 'Must be at least 2 characters. Returned error from custom function.' + ]; + var oneChar = ['a', 'd', 'a', 'd']; + var validInputTexts = ['abc', 'def', 'abc', 'def']; + + describe('When choosing `more-examples` custom remote', function () { + it('Should navigate to home page', function () { + browser.get('http://localhost/Github/angular-validation/more-examples/customRemote/'); + + // Find the title element + var titleElement = element(by.css('h2')); + expect(titleElement.getText()).toEqual('Example of Angular-Validation with Remote Validation'); + }); + + it('Should have multiple errors in Directive & Service validation summary', function () { + var itemRows = element.all(by.binding('message')); + var inputName; + + for (var i = 0, j = 0, ln = itemRows.length; i < ln; i++) { + expect(itemRows.get(i).getText()).toEqual(defaultErrorMessage); + } + }); + + it('Should check that both submit buttons are disabled', function() { + var elmSubmit1 = $('[name=btn_ngDisabled1]'); + expect(elmSubmit1.isEnabled()).toBe(false); + + var elmSubmit2 = $('[name=btn_ngDisabled2]'); + expect(elmSubmit2.isEnabled()).toBe(false); + }); + + it('Should click, blur on each form elements and error message should display on each of them', function () { + for (var i = 0, ln = formElementNames.length; i < ln; i++) { + var elmInput = $('[name=' + formElementNames[i] + ']'); + elmInput.click(); + elmInput.sendKeys(protractor.Key.TAB); + + var elmError = $('.validation-' + formElementNames[i]); + expect(elmError.getText()).toEqual(defaultErrorMessage); + } + }); + + it('Should enter 1 character in all inputs and display minChar error message', function() { + for (var i = 0, ln = formElementNames.length; i < ln; i++) { + var elmInput = $('[name=' + formElementNames[i] + ']'); + elmInput.click(); + elmInput.sendKeys('a'); + browser.sleep(1000); + + var elmError = $('.validation-' + formElementNames[i]); + expect(elmError.getText()).toEqual(errorFromPromise); + } + }); + + it('Should enter valid text and make error go away', function () { + for (var i = 0, ln = formElementNames.length; i < ln; i++) { + var elmInput = $('[name=' + formElementNames[i] + ']'); + elmInput.click(); + clearInput(elmInput); + elmInput.sendKeys(validInputTexts[i]); + elmInput.sendKeys(protractor.Key.TAB); + browser.sleep(1000); + + var elmError = $('.validation-' + formElementNames[i]); + expect(elmError.getText()).toEqual(''); + } + }); + + it('Should have both validation summary empty', function() { + var itemRows = element.all(by.binding('message')); + expect(itemRows.count()).toBe(0); + }); + + it('Should check that both submit buttons are now enabled', function() { + var elmSubmit1 = $('[name=btn_ngDisabled1]'); + expect(elmSubmit1.isEnabled()).toBe(true); + + var elmSubmit2 = $('[name=btn_ngDisabled2]'); + expect(elmSubmit2.isEnabled()).toBe(true); + }); + + it('Should navigate to home page', function () { + browser.get('http://localhost/Github/angular-validation/more-examples/customRemote/'); + + // Find the title element + var titleElement = element(by.css('h2')); + expect(titleElement.getText()).toEqual('Example of Angular-Validation with Remote Validation'); + }); + + it('Should click on both ngSubmit buttons', function() { + var btnNgSubmit1 = $('[name=btn_ngSubmit1]'); + btnNgSubmit1.click(); + + var btnNgSubmit2 = $('[name=btn_ngSubmit2]'); + btnNgSubmit2.click(); + }); + + it('Should show error message on each inputs', function () { + for (var i = 0, ln = formElementNames.length; i < ln; i++) { + var elmInput = $('[name=' + formElementNames[i] + ']'); + elmInput.click(); + elmInput.sendKeys(protractor.Key.TAB); + + var elmError = $('.validation-' + formElementNames[i]); + expect(elmError.getText()).toEqual(defaultErrorMessage); + } + }); + + }); +}); + +/** From a given input name, clear the input + * @param string input name + */ +function clearInput(elem) { + elem.getAttribute('value').then(function (text) { + var len = text.length + var backspaceSeries = Array(len+1).join(protractor.Key.BACK_SPACE); + elem.sendKeys(backspaceSeries); + }) +} \ No newline at end of file diff --git a/readme.md b/readme.md index 6dda544..575af8e 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ #Angular Validation (Directive / Service) -`Version: 1.4.13` -### Form validation after user inactivity of default 1sec. (customizable timeout) +`Version: 1.4.14` +### Form validation after user stop typing (default 1sec). Forms Validation with Angular made easy! Angular-Validation is an angular directive/service with locales (languages) with a very simple approach of defining your `validation=""` directly within your element to validate (input, textarea, etc) and...that's it!!! The directive/service will take care of the rest! @@ -76,18 +76,21 @@ All the documentation has been moved to the Wiki section, see the [github wiki]( * [3rd Party Addon Validation](https://github.com/ghiscoding/angular-validation/wiki/3rd-Party-Addons) * [Directive Examples](https://github.com/ghiscoding/angular-validation/wiki/Working-Directive-Examples) * [Service Examples](https://github.com/ghiscoding/angular-validation/wiki/Working-Service-Examples) +* Functionalities * [Alternate Text on Validators](https://github.com/ghiscoding/angular-validation/wiki/Alternate-Text-on-Validators) * [DisplayErrorTo](https://github.com/ghiscoding/angular-validation/wiki/Bootstrap-Input-Groups-Wrapping) * [Isolated Scope](https://github.com/ghiscoding/angular-validation/wiki/Isolated-Scope) - * [PreValidate Form (on page load)](https://github.com/ghiscoding/angular-validation/wiki/PreValidate-Form-(on-page-load)) - * [Custom Validation function](https://github.com/ghiscoding/angular-validation/wiki/Custom-Validation-functions) - * [Remote Validation (AJAX)](https://github.com/ghiscoding/angular-validation/wiki/Remote-Validation-(AJAX)) - * [Remove a Validator](https://github.com/ghiscoding/angular-validation/wiki/Remove-Validator-from-Element) + * [PreValidate Form (on load)](https://github.com/ghiscoding/angular-validation/wiki/PreValidate-Form-(on-page-load)) * [Reset Form](https://github.com/ghiscoding/angular-validation/wiki/Reset-Form) * [Submit and Validation](https://github.com/ghiscoding/angular-validation/wiki/Form-Submit-and-Validation) + * [Validation Callback](https://github.com/ghiscoding/angular-validation/wiki/Validation-Callback) + * [Validator Remove](https://github.com/ghiscoding/angular-validation/wiki/Remove-Validator-from-Element) * [Validation Summary](https://github.com/ghiscoding/angular-validation/wiki/Validation-Summary) +* Custom Validations + * [Custom Validation (JS)](https://github.com/ghiscoding/angular-validation/wiki/Custom-Validation-functions) + * [Remote Validation (AJAX)](https://github.com/ghiscoding/angular-validation/wiki/Remote-Validation-(AJAX)) * Properties & Options - * [Inputs (all local options)](https://github.com/ghiscoding/angular-validation/wiki/Inputs-(local-options)) + * [Attributes (all options)](https://github.com/ghiscoding/angular-validation/wiki/Inputs-(local-options)) * [Global Options](https://github.com/ghiscoding/angular-validation/wiki/Global-Options) * [ControllerAs Syntax](https://github.com/ghiscoding/angular-validation/wiki/ControllerAs-Syntax) * Validators diff --git a/src/validation-common.js b/src/validation-common.js index 3528ee6..7a23080 100644 --- a/src/validation-common.js +++ b/src/validation-common.js @@ -24,6 +24,7 @@ angular if (_globalOptions.resetGlobalOptionsOnRouteChange) { _globalOptions = { displayOnlyLastErrorMsg: false, // reset the option of displaying only the last error message + hideErrorUnderInputs: false, // reset the option of hiding error under element preValidateFormElements: false, // reset the option of pre-validate all form elements, false by default isolatedScope: null, // reset used scope on route change scope: null, // reset used scope on route change @@ -79,6 +80,7 @@ angular validationCommon.prototype.mergeObjects = mergeObjects; // merge 2 javascript objects, Overwrites obj1's values with obj2's (basically Object2 as higher priority over Object1) validationCommon.prototype.removeFromValidationSummary = removeFromValidationSummary; // remove an element from the $validationSummary validationCommon.prototype.removeFromFormElementObjectList = removeFromFormElementObjectList; // remove named items from formElements list + validationCommon.prototype.runValidationCallbackOnPromise = runValidationCallbackOnPromise; // run a validation callback method when the promise resolve validationCommon.prototype.setDisplayOnlyLastErrorMsg = setDisplayOnlyLastErrorMsg; // setter on the behaviour of displaying only the last error message validationCommon.prototype.setGlobalOptions = setGlobalOptions; // set global options used by all validators (usually called by the validationService) validationCommon.prototype.updateErrorMsg = updateErrorMsg; // update on screen an error message below current form element @@ -229,7 +231,7 @@ angular var validations = rules.split('|'); if (validations) { - self.bFieldRequired = (rules.indexOf("required") >= 0) ? true : false; + self.bFieldRequired = (rules.indexOf("required") >= 0); // loop through all validators of the element for (var i = 0, ln = validations.length; i < ln; i++) { @@ -237,7 +239,7 @@ angular var params = validations[i].split(':'); // check if user provided an alternate text to his validator (validator:alt=Alternate Text) - var hasAltText = validations[i].indexOf("alt=") >= 0 ? true : false; + var hasAltText = validations[i].indexOf("alt=") >= 0; self.validators[i] = validationRules.getElementValidators({ altText: hasAltText === true ? (params.length === 2 ? params[1] : params[2]) : '', @@ -369,6 +371,42 @@ angular return _validationSummary; } + /** Evaluate a function name passed as string and run it from the scope. + * The function name could be passed with/without brackets "()", in any case we will run the function + * @param object self object + * @param string function passed as a string + * @param mixed result + */ + function runEvalScopeFunction(self, fnString) { + var result; + + // Find if our function has the brackets "()" + // if yes then run it through $eval else find it in the scope and then run it + if(/\({1}.*\){1}/gi.test(fnString)) { + result = self.scope.$eval(fnString); + }else { + var fct = objectFindById(self.scope, fnString, '.'); + if(typeof fct === "function") { + result = fct(); + } + } + return result; + } + + /** Run a validation callback function once the promise return + * @param object validation promise + * @param string callback function name (could be with/without the brackets () ) + */ + function runValidationCallbackOnPromise(promise, callbackFct) { + var self = this; + + if(typeof promise.then === "function") { + promise.then(function() { + runEvalScopeFunction(self, callbackFct); + }); + } + } + /** Setter on the behaviour of displaying only the last error message of each element. * By default this is false, so the behavior is to display all error messages of each element. * @param boolean value @@ -441,7 +479,7 @@ angular var isSubmitted = (!!attrs && attrs.isSubmitted) ? attrs.isSubmitted : false; // invalid & isDirty, display the error message... if not exist then create it, else udpate the text - if (!!attrs && !attrs.isValid && (isSubmitted || self.ctrl.$dirty || self.ctrl.$touched)) { + if (!_globalOptions.hideErrorUnderInputs && !!attrs && !attrs.isValid && (isSubmitted || self.ctrl.$dirty || self.ctrl.$touched)) { (errorElm.length > 0) ? errorElm.html(errorMsg) : elm.after('' + errorMsg + ''); } else { errorElm.html(''); // element is pristine or no validation applied, error message has to be blank @@ -703,22 +741,6 @@ angular return -1; } - /** Explode a '.' dot notation string to an object - * @param string str - * @parem object - * @return object - */ - function explodedDotNotationStringToObject(str, obj) { - var split = str.split('.'); - - for (var k = 0, kln = split.length; k < kln; k++) { - if(!!obj[split[k]]) { - obj = obj[split[k]]; - } - } - return obj; - } - /** Get the element's parent Angular form (if found) * @param string: element input name * @param object self @@ -740,11 +762,11 @@ angular for (var i = 0; i < forms.length; i++) { var form = forms[i].form; - var formName = form.getAttribute("name"); + var formName = (!!form) ? form.getAttribute("name") : null; if (!!form && !!formName) { parentForm = (!!_globalOptions && !!_globalOptions.controllerAs && formName.indexOf('.') >= 0) - ? explodedDotNotationStringToObject(formName, self.scope) + ? objectFindById(self.scope, formName, '.') : self.scope[formName]; if(!!parentForm) { @@ -759,7 +781,7 @@ angular // falling here with a form name but without a form object found in the scope is often due to isolate scope // we can hack it and define our own form inside this isolate scope, in that way we can still use something like: isolateScope.form1.$validationSummary if (!!form) { - var formName = form.getAttribute("name"); + var formName = (!!form) ? form.getAttribute("name") : null; if(!!formName) { var obj = { $name: formName, specialNote: 'Created by Angular-Validation for Isolated Scope usage' }; @@ -781,6 +803,23 @@ angular return !isNaN(parseFloat(n)) && isFinite(n); } + /** Find a property inside an object. + * If a delimiter is passed as argument, we will split the search ID before searching + * @param object: source object + * @param string: searchId + * @return mixed: property found + */ + function objectFindById(sourceObject, searchId, delimiter) { + var split = (!!delimiter) ? searchId.split(delimiter) : searchId; + + for (var k = 0, kln = split.length; k < kln; k++) { + if(!!sourceObject[split[k]]) { + sourceObject = sourceObject[split[k]]; + } + } + return sourceObject; + } + /** Parse a date from a String and return it as a Date Object to be valid for all browsers following ECMA Specs * Date type ISO (default), US, UK, Europe, etc... Other format could be added in the switch case * @param String dateStr: date String @@ -890,16 +929,16 @@ angular var result = false; switch (condition) { - case '<': result = (value1 < value2) ? true : false; break; - case '<=': result = (value1 <= value2) ? true : false; break; - case '>': result = (value1 > value2) ? true : false; break; - case '>=': result = (value1 >= value2) ? true : false; break; + case '<': result = (value1 < value2); break; + case '<=': result = (value1 <= value2); break; + case '>': result = (value1 > value2); break; + case '>=': result = (value1 >= value2); break; case '!=': - case '<>': result = (value1 != value2) ? true : false; break; - case '!==': result = (value1 !== value2) ? true : false; break; + case '<>': result = (value1 != value2); break; + case '!==': result = (value1 !== value2); break; case '=': - case '==': result = (value1 == value2) ? true : false; break; - case '===': result = (value1 === value2) ? true : false; break; + case '==': result = (value1 == value2); break; + case '===': result = (value1 === value2); break; default: result = false; break; } return result; @@ -970,7 +1009,7 @@ angular var timestampParam1 = parseDate(validator.params[1], dateType).getTime(); var isValid1 = testCondition(validator.condition[0], timestampValue, timestampParam0); var isValid2 = testCondition(validator.condition[1], timestampValue, timestampParam1); - isValid = (isValid1 && isValid2) ? true : false; + isValid = (isValid1 && isValid2); } else { // else, 1 param is a simple conditional date check var timestampParam = parseDate(validator.params[0], dateType).getTime(); @@ -994,7 +1033,7 @@ angular // this is typically a "between" condition, a range of number >= and <= var isValid1 = testCondition(validator.condition[0], parseFloat(strValue), parseFloat(validator.params[0])); var isValid2 = testCondition(validator.condition[1], parseFloat(strValue), parseFloat(validator.params[1])); - isValid = (isValid1 && isValid2) ? true : false; + isValid = (isValid1 && isValid2); } else { // else, 1 param is a simple conditional number check isValid = testCondition(validator.condition, parseFloat(strValue), parseFloat(validator.params[0])); @@ -1022,25 +1061,14 @@ angular if (!!strValue) { var fct = null; var fname = validator.params[0]; - if (fname.indexOf(".") === -1) { - fct = self.scope[fname]; - } else { - // function name might also be declared with the Controller As alias, for example: vm.customJavascript() - // split the name and flatten it so that we can find it inside the scope - var split = fname.split('.'); - fct = self.scope; - for (var k = 0, kln = split.length; k < kln; k++) { - fct = fct[split[k]]; - } - } - var result = (typeof fct === "function") ? fct() : null; + var result = runEvalScopeFunction(self, fname); // analyze the result, could be a boolean or object type, anything else will throw an error if (typeof result === "boolean") { - isValid = (!!result) ? true : false; + isValid = (!!result); } else if (typeof result === "object") { - isValid = (!!result.isValid) ? true : false; + isValid = (!!result.isValid); } else { throw invalidResultErrorMsg; @@ -1161,18 +1189,7 @@ angular var fct = null; var fname = validator.params[0]; - if (fname.indexOf(".") === -1) { - fct = self.scope[fname]; - } else { - // function name might also be declared with the Controller As alias, for example: vm.customRemote() - // split the name and flatten it so that we can find it inside the scope - var split = fname.split('.'); - fct = self.scope; - for (var k = 0, kln = split.length; k < kln; k++) { - fct = fct[split[k]]; - } - } - var promise = (typeof fct === "function") ? fct() : null; + var promise = runEvalScopeFunction(self, fname); // if we already have previous promises running, we might want to abort them (if user specified an abort function) if (_remotePromises.length > 1) { @@ -1199,10 +1216,10 @@ angular // analyze the result, could be a boolean or object type, anything else will throw an error if (typeof result === "boolean") { - isValid = (!!result) ? true : false; + isValid = (!!result); } else if (typeof result === "object") { - isValid = (!!result.isValid) ? true : false; + isValid = (!!result.isValid); } else { throw invalidResultErrorMsg; diff --git a/src/validation-directive.js b/src/validation-directive.js index fcbe3ca..8d4f719 100644 --- a/src/validation-directive.js +++ b/src/validation-directive.js @@ -24,8 +24,9 @@ var _timer; var _watchers = []; - // Possible element attributesW + // Possible element attributes var _elmName = attrs.name; + var _validationCallback = (attrs.hasOwnProperty('validationCallback')) ? attrs.validationCallback : null; //-- Possible validation-array attributes // on a validation array, how many does it require to be valid? @@ -50,7 +51,11 @@ unbindBlurHandler(); return invalidateBadInputField(); } - attemptToValidate(newValue); + // attempt to validate & run validation callback if user requested it + var validationPromise = attemptToValidate(newValue); + if(!!_validationCallback) { + commonObj.runValidationCallbackOnPromise(validationPromise, _validationCallback); + } }, true); // save the watcher inside an array in case we want to deregister it when removing a validator @@ -101,6 +106,7 @@ * and is also customizable through the (typing-limit) for which inactivity this.timer will trigger validation. * @param string value: value of the input field * @param int typingLimit: when user stop typing, in how much time it will start validating + * @return object validation promise */ function attemptToValidate(value, typingLimit) { var deferred = $q.defer(); @@ -193,7 +199,7 @@ return deferred.promise; } // attemptToValidate() - /** Attempt to validate an input value that was previously exploded fromn the input array + /** Attempt to validate an input value that was previously exploded from the input array * Each attempt will return a promise but only after reaching the last index, will we analyze the final validation. * @param string: input value * @param int: position index @@ -251,7 +257,11 @@ var value = (typeof ctrl.$modelValue !== "undefined") ? ctrl.$modelValue : event.target.value; if (!formElmObj.isValidationCancelled) { - attemptToValidate(value, 10); + // attempt to validate & run validation callback if user requested it + var validationPromise = attemptToValidate(value, 10); + if(!!_validationCallback) { + commonObj.runValidationCallbackOnPromise(validationPromise, _validationCallback); + } }else { ctrl.$setValidity('validation', true); } diff --git a/src/validation-service.js b/src/validation-service.js index 72e22e8..deafa25 100644 --- a/src/validation-service.js +++ b/src/validation-service.js @@ -9,10 +9,11 @@ */ angular .module('ghiscoding.validation') - .service('validationService', ['$interpolate', '$timeout', 'validationCommon', function ($interpolate, $timeout, validationCommon) { + .service('validationService', ['$interpolate', '$q', '$timeout', 'validationCommon', function ($interpolate, $q, $timeout, validationCommon) { // global variables of our object (start with _var) var _blurHandler; var _watchers = []; + var _validationCallback; // service constructor var validationService = function (globalOptions) { @@ -91,6 +92,8 @@ angular } } + _validationCallback = (self.validationAttrs.hasOwnProperty('validationCallback')) ? self.validationAttrs.validationCallback : null; + // onBlur make validation without waiting attrs.elm.bind('blur', _blurHandler = function(event) { // get the form element custom object and use it after @@ -99,7 +102,12 @@ angular if (!!formElmObj && !formElmObj.isValidationCancelled) { // re-initialize to use current element & validate without delay self.commonObj.initialize(scope, attrs.elm, attrs, attrs.ctrl); - attemptToValidate(self, event.target.value, 10); + + // attempt to validate & run validation callback if user requested it + var validationPromise = attemptToValidate(self, event.target.value, 10); + if(!!_validationCallback) { + self.commonObj.runValidationCallbackOnPromise(validationPromise, _validationCallback); + } } }); @@ -151,7 +159,11 @@ angular self.commonObj.initialize(scope, attrs.elm, attrs, attrs.ctrl); var waitingTimer = (typeof newValue === "undefined" || (typeof newValue === "number" && isNaN(newValue))) ? 0 : undefined; - attemptToValidate(self, newValue, waitingTimer); + // attempt to validate & run validation callback if user requested it + var validationPromise = attemptToValidate(self, newValue, waitingTimer); + if(!!_validationCallback) { + self.commonObj.runValidationCallbackOnPromise(validationPromise, _validationCallback); + } }, true); // $watch() // save the watcher inside an array in case we want to deregister it when removing a validator @@ -329,8 +341,12 @@ angular * @param object self * @param string value: value of the input field * @param int typingLimit: when user stop typing, in how much time it will start validating + * @return object validation promise */ function attemptToValidate(self, value, typingLimit) { + var deferred = $q.defer(); + var isValid = false; + // get the waiting delay time if passed as argument or get it from common Object var waitingLimit = (typeof typingLimit !== "undefined") ? typingLimit : self.commonObj.typingLimit; @@ -350,7 +366,8 @@ angular // if field is not required and his value is empty, cancel validation and exit out if(!self.commonObj.isFieldRequired() && (value === "" || value === null || typeof value === "undefined")) { cancelValidation(self, formElmObj); - return value; + deferred.resolve({ isFieldValid: true, formElmObj: formElmObj, value: value }); + return deferred.promise; }else { formElmObj.isValidationCancelled = false; } @@ -364,14 +381,17 @@ angular // we will still call the `.validate()` function so that it shows also the possible other error messages if((value === "" || typeof value === "undefined") && self.commonObj.elm.prop('type').toUpperCase() === "NUMBER") { $timeout.cancel(self.timer); - self.commonObj.ctrl.$setValidity('validation', self.commonObj.validate(value, true)); - return value; + isValid = self.commonObj.validate(value, true); + deferred.resolve({ isFieldValid: isValid, formElmObj: formElmObj, value: value }); + return deferred.promise; } // select(options) will be validated on the spot if(self.commonObj.elm.prop('tagName').toUpperCase() === "SELECT") { - self.commonObj.ctrl.$setValidity('validation', self.commonObj.validate(value, true)); - return value; + isValid = self.commonObj.validate(value, true); + self.commonObj.ctrl.$setValidity('validation', isValid); + deferred.resolve({ isFieldValid: isValid, formElmObj: formElmObj, value: value }); + return deferred.promise; } // onKeyDown event is the default of Angular, no need to even bind it, it will fall under here anyway @@ -379,19 +399,23 @@ angular if(typeof value !== "undefined") { // when no timer, validate right away without a $timeout. This seems quite important on the array input value check if(typingLimit === 0) { - self.commonObj.scope.$evalAsync(self.commonObj.ctrl.$setValidity('validation', self.commonObj.validate(value, true) )); + isValid = self.commonObj.validate(value, true); + self.commonObj.scope.$evalAsync(self.commonObj.ctrl.$setValidity('validation', isValid )); + deferred.resolve({ isFieldValid: isValid, formElmObj: formElmObj, value: value }); }else { // Make the validation only after the user has stopped activity on a field // everytime a new character is typed, it will cancel/restart the timer & we'll erase any error mmsg self.commonObj.updateErrorMsg(''); $timeout.cancel(self.timer); self.timer = $timeout(function() { - self.commonObj.scope.$evalAsync(self.commonObj.ctrl.$setValidity('validation', self.commonObj.validate(value, true) )); + isValid = self.commonObj.validate(value, true); + self.commonObj.scope.$evalAsync(self.commonObj.ctrl.$setValidity('validation', isValid )); + deferred.resolve({ isFieldValid: isValid, formElmObj: formElmObj, value: value }); }, waitingLimit); } } - return value; + return deferred.promise; } // attemptToValidate() /** Cancel current validation test and blank any leftover error message @@ -531,7 +555,11 @@ angular // re-attach the onBlur handler attrs.elm.bind('blur', _blurHandler = function(event) { if (!!formElmObj && !formElmObj.isValidationCancelled) { - attemptToValidate(self, event.target.value, 10); + // attempt to validate & run validation callback if user requested it + var validationPromise = attemptToValidate(self, event.target.value, 10); + if(!!_validationCallback) { + self.commonObj.runValidationCallbackOnPromise(validationPromise, _validationCallback); + } } }); } diff --git a/templates/testingFormDirective.html b/templates/testingFormDirective.html index 442ce0a..342484d 100644 --- a/templates/testingFormDirective.html +++ b/templates/testingFormDirective.html @@ -38,7 +38,7 @@

{{ 'ERRORS' | translate }}!

- +