Skip to content

Commit f64d244

Browse files
christianalfonichristianalfoni
committed
releasing 0.12.6
1 parent 33ae737 commit f64d244

File tree

5 files changed

+28
-25
lines changed

5 files changed

+28
-25
lines changed

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "formsy-react",
3-
"version": "0.12.5",
3+
"version": "0.12.6",
44
"description": "A form input builder and validator for React JS",
55
"repository": {
66
"type": "git",

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "formsy-react",
3-
"version": "0.12.5",
3+
"version": "0.12.6",
44
"description": "A form input builder and validator for React JS",
55
"repository": {
66
"type": "git",

‎release/formsy-react.js

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ var convertValidationsToObject = function (validations) {
436436
if (args.length > 1) {
437437
throw new Error('Formsy does not support multiple args on string validations. Use object format of validations instead.');
438438
}
439-
validations[validateMethod] = args[0] || true;
439+
validations[validateMethod] = args.length ? args[0] : true;
440440
return validations;
441441
}, {});
442442

@@ -593,53 +593,56 @@ module.exports = {
593593

594594
},{}],4:[function(require,module,exports){
595595
module.exports = {
596-
'isDefaultRequiredValue': function (values, value) {
596+
isDefaultRequiredValue: function (values, value) {
597597
return value === undefined || value === '';
598598
},
599-
'hasValue': function (values, value) {
600-
return value !== undefined;
599+
hasValue: function (values, value) {
600+
return !!value;
601601
},
602-
'matchRegexp': function (values, value, regexp) {
603-
return value !== undefined && !!value.match(regexp);
602+
matchRegexp: function (values, value, regexp) {
603+
return !!value && !!value.match(regexp);
604604
},
605-
'isUndefined': function (values, value) {
605+
isUndefined: function (values, value) {
606606
return value === undefined;
607607
},
608-
'isEmptyString': function (values, value) {
608+
isEmptyString: function (values, value) {
609609
return value === '';
610610
},
611-
'isEmail': function (values, value) {
611+
isEmail: function (values, value) {
612612
return !value || value.match(/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i);
613613
},
614-
'isTrue': function (values, value) {
614+
isTrue: function (values, value) {
615615
return value === true;
616616
},
617-
'isFalse': function (values, value) {
617+
isFalse: function (values, value) {
618618
return value === false;
619619
},
620-
'isNumeric': function (values, value) {
620+
isNumeric: function (values, value) {
621+
if (!value) {
622+
return false;
623+
}
621624
if (typeof value === 'number') {
622625
return true;
623626
} else {
624-
var matchResults = value !== undefined && value.match(/[-+]?(\d*[.])?\d+/);
627+
var matchResults = value.match(/[-+]?(\d*[.])?\d+/);
625628
if (!!matchResults) {
626629
return matchResults[0] == value;
627630
} else {
628631
return false;
629632
}
630633
}
631634
},
632-
'isAlpha': function (values, value) {
633-
return !value || value.match(/^[a-zA-Z]+$/);
635+
isAlpha: function (values, value) {
636+
return value && /^[a-zA-Z]+$/.test(value);
634637
},
635-
'isWords': function (values, value) {
636-
return !value || value.match(/^[a-zA-Z\s]+$/);
638+
isWords: function (values, value) {
639+
return value && /^[a-zA-Z\s]+$/.test(value);
637640
},
638-
'isSpecialWords': function (values, value) {
641+
isSpecialWords: function (values, value) {
639642
return !value || value.match(/^[a-zA-Z\s\u00C0-\u017F]+$/);
640643
},
641644
isLength: function (values, value, length) {
642-
return value !== undefined && value.length === length;
645+
return value && value.length === length;
643646
},
644647
equals: function (values, value, eql) {
645648
return value == eql;
@@ -648,10 +651,10 @@ module.exports = {
648651
return value == values[field];
649652
},
650653
maxLength: function (values, value, length) {
651-
return value !== undefined && value.length <= length;
654+
return value && value.length && value.length <= length;
652655
},
653656
minLength: function (values, value, length) {
654-
return value !== undefined && value.length >= length;
657+
return value && value.length && value.length >= length;
655658
}
656659
};
657660

0 commit comments

Comments
 (0)