Moved global options under a namespace. Option to not add success msg and option to add prefix to all error message. Various cleanup #8 #9

Author: sagrawal31

src/app.provider.js

@@ -18,13 +18,11 @@ angular.module('bootstrap.angular.validation').provider('bsValidationConfig', fu
   }
 
   var _this = this;
+  this.global = {};
+  this.global.addSuccessClass = true;
+  this.global.errorMessagePrefix = '';
 
-  // Values can be "simple" or "tooltip"
-  _this.displayErrorsAs = 'simple';
-
-  _this.addSuccessClass = true;
-
-  _this.setValidateFieldsOn = function(event) {
+  this.global.setValidateFieldsOn = function(event) {
     if (!event) {
       throw 'Please provide an string or list of events to validate fields on';
     }
@@ -36,22 +34,26 @@ angular.module('bootstrap.angular.validation').provider('bsValidationConfig', fu
     validateFieldsOn = event;
   };
 
-  _this.setDisplayErrorsAs = function(type) {
+  this.global.setDisplayErrorsAs = function(type) {
     if (!type) {
       throw 'Please provide the way validation error should be displayed. In-built options are "simple" & "tooltip".';
     }
 
     displayErrorsAs = type;
   };
 
-  _this.$get = [function() {
+  this.$get = [function() {
     return {
       getDisplayErrorsAs: function() {
         return displayErrorsAs;
       },
 
+      getErrorMessagePrefix: function() {
+        return _this.global.errorMessagePrefix || '';
+      },
+
       shouldAddSuccessClass: function() {
-        return _this.addSuccessClass;
+        return _this.global.addSuccessClass;
       },
 
       shouldValidateOnBlur: function() {

src/services/simple.message.service.js

@@ -1,16 +1,16 @@
 'use strict';
 
-angular.module('bootstrap.angular.validation').factory('simpleMessageService', ['BsValidationService', function(validationService) {
+angular.module('bootstrap.angular.validation').factory('simpleMessageService', ['BsValidationService', 'bsValidationConfig',
+function(validationService, validationConfig) {
 
   var errorElementClass = '.bs-invalid-msg';
-  var helpBlockClass = '.help-block';
 
-  var errorClasses = [errorElementClass.substring(1), helpBlockClass.substring(1)];
-  var markupClasses = errorClasses.join(' ');
-
-  var iconMarkup = '<i class="fa fa-exclamation-triangle fa-fw"></i>';
+  function errorContainer($element, $formGroupElement) {
+    var $errorElement = $formGroupElement.findOne(errorElementClass);
+    if ($errorElement && $errorElement.length) {
+      return $errorElement;
+    }
 
-  function errorContainer($element, $formGroupElement, message) {
     var insertAfter;
 
     // Check if the container have any Bootstrap input group then append the error after it
@@ -21,15 +21,14 @@ angular.module('bootstrap.angular.validation').factory('simpleMessageService', [
       insertAfter = $element;
     }
 
-    message = '<span class="' + markupClasses + '">' + iconMarkup + message + '</span>';
-
-    insertAfter.after(message);
+    insertAfter.after('<span class="help-block ' + errorElementClass.substring(1) + '"></span>');
+    return $formGroupElement.findOne(errorElementClass);
   }
 
   return {
     hideErrorMessage: function($element, $formGroupElement) {
       validationService.removeErrorClass($formGroupElement);
-      $formGroupElement.findAll('span.' + errorClasses.join('.')).addClass('ng-hide');
+      $formGroupElement.findAll(errorElementClass).addClass('ng-hide');
     },
 
     resolveMessage: function($element, $attr, key) {
@@ -38,14 +37,10 @@ angular.module('bootstrap.angular.validation').factory('simpleMessageService', [
 
     showErrorMessage: function($element, $attr, ngModelController, $formGroupElement) {
       var firstErrorKey = Object.keys(ngModelController.$error)[0];
-      var message = this.resolveMessage($element, $attr, firstErrorKey);
-
-      var errorElement = $formGroupElement.findOne(errorElementClass);
-      if (errorElement.length === 0) {
-        errorContainer($element, $formGroupElement, message);
-      }
+      var message = validationConfig.getErrorMessagePrefix() + this.resolveMessage($element, $attr, firstErrorKey);
 
-      errorElement.html(iconMarkup + message).removeClass('ng-hide');
+      var $errorElement = errorContainer($element, $formGroupElement);
+      $errorElement.html(message).removeClass('ng-hide');
     }
   };
 }]);

src/services/tooltip.message.service.js

@@ -3,9 +3,7 @@
 'use strict';
 
 angular.module('bootstrap.angular.validation').factory('tooltipMessageService', ['$injector', 'BsValidationService',
-function($injector, validationService) {
-
-  var iconMarkup = '<i class="fa fa-exclamation-triangle fa-fw"></i>';
+'bsValidationConfig', function($injector, validationService, validationConfig) {
 
   function getElementID($element) {
     var id = $element.attr('id');
@@ -40,7 +38,7 @@ function($injector, validationService) {
 
     showErrorMessage: function($element, $attr, ngModelController) {
       var firstErrorKey = Object.keys(ngModelController.$error)[0];
-      var message = this.resolveMessage($element, $attr, firstErrorKey);
+      var message = validationConfig.getErrorMessagePrefix() + this.resolveMessage($element, $attr, firstErrorKey);
 
       var tooltipID = getErrorTooltipID($element);
       var $errorTooltip = getErrorTooltip($element);

src/services/validation.service.js

@@ -6,7 +6,7 @@
  * @description Core service of this module to provide various default validations.
  */
 angular.module('bootstrap.angular.validation').factory('BsValidationService', ['$interpolate', 'bsValidationConfig',
-'$injector', function($interpolate, bsValidationConfig, $injector) {
+'$injector', function($interpolate, validationConfig, $injector) {
 
   var displayErrorAsAttrName = 'bsDisplayErrorAs';
   var customFormGroup = '[bs-form-group]';
@@ -103,7 +103,10 @@ angular.module('bootstrap.angular.validation').factory('BsValidationService', ['
 
     addSuccessClass: function($formGroupElement) {
       this.removeErrorClass($formGroupElement);
-      $formGroupElement.addClass('has-success');
+
+      if (validationConfig.shouldAddSuccessClass()) {
+        $formGroupElement.addClass('has-success');
+      }
     },
 
     addToNgIncludedURLs: function (url) {
@@ -147,7 +150,7 @@ angular.module('bootstrap.angular.validation').factory('BsValidationService', ['
       }
 
       // Use the global preference
-      return bsValidationConfig.getDisplayErrorsAs();
+      return validationConfig.getDisplayErrorsAs();
     },
 
     getDefaultMessage: function (key) {