Browse Source

Color validator: Optimize return flow in for loop

Emil Rømer Christensen 11 years ago
parent
commit
574038d24c
1 changed files with 6 additions and 2 deletions
  1. 6 2
      src/js/validator/color.js

+ 6 - 2
src/js/validator/color.js

@@ -27,15 +27,19 @@
             var useCustomTypes = (options.hasOwnProperty('type') && options.type instanceof Array);
             var types = useCustomTypes ? options.type : defaultTypes;
             var isValid = false;
-            var formatedMessage = $.fn.bootstrapValidator.helpers.format(options.message || (useCustomTypes ? $.fn.bootstrapValidator.i18n.color.type : $.fn.bootstrapValidator.i18n.color.default), types.join(", "));
+            var formatedMessage = $.fn.bootstrapValidator.helpers.format(
+                                        options.message || (useCustomTypes ? $.fn.bootstrapValidator.i18n.color.type : $.fn.bootstrapValidator.i18n.color.default),
+                                        types.join(", ")
+            );
 
             for (var i = 0; i < types.length; i++) {
                 type = types[i];
                 method = '_' + type.toLowerCase();
                 isValid = isValid || this[method](value);
+                if (isValid) return true;
             }
 
-            return isValid || {
+            return {
                 valid: false,
                 message: formatedMessage
             };