Skip to content

Commit

Permalink
releasing 0.12.6
Browse files Browse the repository at this point in the history
  • Loading branch information
christianalfoni committed Apr 22, 2015
1 parent 33ae737 commit f64d244
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 25 deletions.
2 changes: 1 addition & 1 deletion bower.json
@@ -1,6 +1,6 @@
{
"name": "formsy-react",
"version": "0.12.5",
"version": "0.12.6",
"description": "A form input builder and validator for React JS",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "formsy-react",
"version": "0.12.5",
"version": "0.12.6",
"description": "A form input builder and validator for React JS",
"repository": {
"type": "git",
Expand Down
45 changes: 24 additions & 21 deletions release/formsy-react.js
Expand Up @@ -436,7 +436,7 @@ var convertValidationsToObject = function (validations) {
if (args.length > 1) {
throw new Error('Formsy does not support multiple args on string validations. Use object format of validations instead.');
}
validations[validateMethod] = args[0] || true;
validations[validateMethod] = args.length ? args[0] : true;
return validations;
}, {});

Expand Down Expand Up @@ -593,53 +593,56 @@ module.exports = {

},{}],4:[function(require,module,exports){
module.exports = {
'isDefaultRequiredValue': function (values, value) {
isDefaultRequiredValue: function (values, value) {
return value === undefined || value === '';
},
'hasValue': function (values, value) {
return value !== undefined;
hasValue: function (values, value) {
return !!value;
},
'matchRegexp': function (values, value, regexp) {
return value !== undefined && !!value.match(regexp);
matchRegexp: function (values, value, regexp) {
return !!value && !!value.match(regexp);
},
'isUndefined': function (values, value) {
isUndefined: function (values, value) {
return value === undefined;
},
'isEmptyString': function (values, value) {
isEmptyString: function (values, value) {
return value === '';
},
'isEmail': function (values, value) {
isEmail: function (values, value) {
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);
},
'isTrue': function (values, value) {
isTrue: function (values, value) {
return value === true;
},
'isFalse': function (values, value) {
isFalse: function (values, value) {
return value === false;
},
'isNumeric': function (values, value) {
isNumeric: function (values, value) {
if (!value) {
return false;
}
if (typeof value === 'number') {
return true;
} else {
var matchResults = value !== undefined && value.match(/[-+]?(\d*[.])?\d+/);
var matchResults = value.match(/[-+]?(\d*[.])?\d+/);
if (!!matchResults) {
return matchResults[0] == value;
} else {
return false;
}
}
},
'isAlpha': function (values, value) {
return !value || value.match(/^[a-zA-Z]+$/);
isAlpha: function (values, value) {
return value && /^[a-zA-Z]+$/.test(value);
},
'isWords': function (values, value) {
return !value || value.match(/^[a-zA-Z\s]+$/);
isWords: function (values, value) {
return value && /^[a-zA-Z\s]+$/.test(value);
},
'isSpecialWords': function (values, value) {
isSpecialWords: function (values, value) {
return !value || value.match(/^[a-zA-Z\s\u00C0-\u017F]+$/);
},
isLength: function (values, value, length) {
return value !== undefined && value.length === length;
return value && value.length === length;
},
equals: function (values, value, eql) {
return value == eql;
Expand All @@ -648,10 +651,10 @@ module.exports = {
return value == values[field];
},
maxLength: function (values, value, length) {
return value !== undefined && value.length <= length;
return value && value.length && value.length <= length;
},
minLength: function (values, value, length) {
return value !== undefined && value.length >= length;
return value && value.length && value.length >= length;
}
};

Expand Down

0 comments on commit f64d244

Please sign in to comment.