1515angular . module ( 'bootstrap.angular.validation' ) . directive ( 'bsValidation' , [
1616 '$interpolate' , '$timeout' , '$injector' , 'BsValidationService' , 'bsValidationConfig' ,
1717
18- function ( $interpolate , $timeout , $injector , bsValidationService , bsValidationConfig ) {
18+ function ( $interpolate , $timeout , $injector , validationService , validationConfig ) {
1919 return {
2020 restrict : 'A' ,
2121 require : [ 'ngModel' , '?^^form' ] ,
@@ -32,25 +32,25 @@ angular.module('bootstrap.angular.validation').directive('bsValidation', [
3232 // All classed needed to add to validation message
3333 var errorClasses = [ errorElementClass , helpBlock ] ;
3434
35- var $formGroupElement = bsValidationService . getFormGroupElement ( $element ) ;
35+ var $formGroupElement = validationService . getFormGroupElement ( $element ) ;
3636 if ( ! $formGroupElement ) {
3737 throw 'No parent form group element found for input element' ;
3838 }
3939
4040 var displayValidationState = false ;
41- var shouldValidateOnBlur = bsValidationConfig . shouldValidateOnBlur ( ) ;
42- var shouldValidateOnDisplay = bsValidationConfig . shouldValidateOnDisplay ( ) ;
43- var shouldValidateOnSubmit = bsValidationConfig . shouldValidateOnSubmit ( ) ;
41+ var shouldValidateOnBlur = validationConfig . shouldValidateOnBlur ( ) ;
42+ var shouldValidateOnDisplay = validationConfig . shouldValidateOnDisplay ( ) ;
43+ var shouldValidateOnSubmit = validationConfig . shouldValidateOnSubmit ( ) ;
4444
45- var metaInformation = bsValidationService . getMetaInformation ( $element ) ;
46- var displayErrorAs = bsValidationService . displayErrorPreference ( $element , $attr ) ;
47- var validationMessageService = bsValidationService . getValidationMessageService ( displayErrorAs ) ;
45+ var metaInformation = validationService . getMetaInformation ( $element ) ;
46+ var displayErrorAs = validationService . displayErrorPreference ( $element , $attr ) ;
47+ var validationMessageService = validationService . getValidationMessageService ( displayErrorAs ) ;
4848
4949 // Register generic custom validators if added to element
50- angular . forEach ( bsValidationService . getValidators ( ) , function ( key ) {
50+ angular . forEach ( validationService . getValidators ( ) , function ( key ) {
5151 var attrValue = $element . attr ( key ) ;
5252 if ( $attr [ key ] || ( angular . isDefined ( attrValue ) && attrValue !== false ) ) {
53- bsValidationService . addValidator ( $scope , $attr , ngModelController , key , metaInformation ) ;
53+ validationService . addValidator ( $scope , $attr , ngModelController , key , metaInformation ) ;
5454 }
5555 } ) ;
5656
@@ -63,7 +63,7 @@ angular.module('bootstrap.angular.validation').directive('bsValidation', [
6363 }
6464
6565 function addErrors ( ) {
66- bsValidationService . addErrorClass ( $formGroupElement ) ;
66+ validationService . addErrorClass ( $formGroupElement ) ;
6767 validationMessageService . showErrorMessage ( $element , $attr , ngModelController , $formGroupElement ) ;
6868 return false ;
6969 }
0 commit comments