|
|
@@ -26,6 +26,7 @@
|
|
|
<<<<<<< HEAD
|
|
|
<<<<<<< HEAD
|
|
|
<<<<<<< HEAD
|
|
|
+<<<<<<< HEAD
|
|
|
* @version v0.5.3-dev, built on 2014-10-06 8:02:42 AM
|
|
|
=======
|
|
|
* @version v0.5.2-dev, built on 2014-09-18 9:55:01 PM
|
|
|
@@ -99,6 +100,9 @@
|
|
|
=======
|
|
|
* @version v0.5.2-dev, built on 2014-09-18 10:04:40 PM
|
|
|
>>>>>>> Refactor test suite for color validator.
|
|
|
+=======
|
|
|
+ * @version v0.5.2-dev, built on 2014-10-06 1:41:04 PM
|
|
|
+>>>>>>> Add i18n for color types.
|
|
|
* @author https://twitter.com/nghuuphuoc
|
|
|
* @copyright (c) 2013 - 2014 Nguyen Huu Phuoc
|
|
|
* @license MIT
|
|
|
@@ -2279,10 +2283,17 @@ if (typeof jQuery === 'undefined') {
|
|
|
}(window.jQuery));
|
|
|
;(function($) {
|
|
|
$.fn.bootstrapValidator.i18n.color = $.extend($.fn.bootstrapValidator.i18n.color || {}, {
|
|
|
- 'default': 'Please enter a valid color',
|
|
|
- 'type': 'Please enter a valid %s color'
|
|
|
+ 'default': 'Please enter a valid color',
|
|
|
+ 'type': 'Please enter a valid %s color',
|
|
|
+ 'defaultTypes': {
|
|
|
+ hex: 'hex',
|
|
|
+ rgb: 'rgb',
|
|
|
+ rgba: 'rgba',
|
|
|
+ hsl: 'hsl',
|
|
|
+ hsla: 'hsla',
|
|
|
+ keyword: 'keyword'
|
|
|
+ }
|
|
|
});
|
|
|
-
|
|
|
$.fn.bootstrapValidator.validators.color = {
|
|
|
|
|
|
/**
|
|
|
@@ -2306,18 +2317,22 @@ if (typeof jQuery === 'undefined') {
|
|
|
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 usedTypes = [];
|
|
|
|
|
|
for (var i = 0; i < types.length; i++) {
|
|
|
type = types[i];
|
|
|
+ usedTypes.push($.fn.bootstrapValidator.i18n.color.defaultTypes[type]);
|
|
|
+
|
|
|
method = '_' + type.toLowerCase();
|
|
|
isValid = isValid || this[method](value);
|
|
|
if (isValid) return true;
|
|
|
}
|
|
|
|
|
|
+ var formatedMessage = $.fn.bootstrapValidator.helpers.format(
|
|
|
+ options.message || (useCustomTypes ? $.fn.bootstrapValidator.i18n.color.type : $.fn.bootstrapValidator.i18n.color.default),
|
|
|
+ usedTypes.join(", ")
|
|
|
+ );
|
|
|
+
|
|
|
return {
|
|
|
valid: false,
|
|
|
message: formatedMessage
|
Emil Rømer Christensen