TouchInstinct
/
formsy-react
302
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added string returns error for rules

This commit is contained in:
christianalfoni 2015-04-13 19:15:10 +02:00
parent c5bbc06178
commit 8b42fd254a
3 changed files with 150 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
release/formsy-react.js
View File

@ -275,6 +275,10 @@ Formsy.Form = React.createClass({displayName: "Form",
return '';
}
if (validationResults.errors.length) {
return validationResults.errors[0];
}
if (this.props.validationErrors && this.props.validationErrors[component.props.name]) {
return this.props.validationErrors[component.props.name];
}
@ -295,6 +299,7 @@ Formsy.Form = React.createClass({displayName: "Form",
runRules: function (value, currentValues, validations) {
var results = {
errors: [],
failed: [],
success: []
};
@ -309,10 +314,28 @@ Formsy.Form = React.createClass({displayName: "Form",
throw new Error('Formsy does not have the validation rule: ' + validationMethod);
}
if (typeof validations[validationMethod] === 'function' && !validations[validationMethod](currentValues, value)) {
return results.failed.push(validationMethod);
} else if (typeof validations[validationMethod] !== 'function' && !validationRules[validationMethod](currentValues, value, validations[validationMethod])) {
return results.failed.push(validationMethod);
if (typeof validations[validationMethod] === 'function') {
var validation = validations[validationMethod](currentValues, value);
if (typeof validation === 'string') {
results.errors.push(validation);
results.failed.push(validationMethod);
} else if (!validation) {
results.failed.push(validationMethod);
}
return;
} else if (typeof validations[validationMethod] !== 'function') {
var validation = validationRules[validationMethod](currentValues, value, validations[validationMethod]);
if (typeof validation === 'string') {
results.errors.push(validation);
results.failed.push(validationMethod);
} else if (!validation) {
results.failed.push(validationMethod);
} else {
results.success.push(validationMethod);
}
return;
}
return results.success.push(validationMethod);
@ -324,6 +347,53 @@ Formsy.Form = React.createClass({displayName: "Form",
},
/*
var results = {
errors: [],
failed: [],
success: []
};
if (Object.keys(validations).length) {
Object.keys(validations).forEach(function (validationMethod) {
if (validationRules[validationMethod] && typeof validations[validationMethod] === 'function') {
throw new Error('Formsy does not allow you to override default validations: ' + validationMethod);
}
if (!validationRules[validationMethod] && typeof validations[validationMethod] !== 'function') {
throw new Error('Formsy does not have the validation rule: ' + validationMethod);
}
if (typeof validations[validationMethod] === 'function') {
var validation = validations[validationMethod](currentValues, value);
if (typeof validation === 'string') {
results.errors.push(validation);
results.failed.push(validationMethod);
} else if (!validation) {
results.failed.push(validationMethod);
}
return;
} else if (typeof validations[validationMethod] !== 'function') {
var validation = validationRules[validationMethod](currentValues, value, validations[validationMethod]);
if (typeof validation === 'string') {
results.errors.push(validation);
results.failed.push(validationMethod);
} else if (!validation) {
results.failed.push(validationMethod);
}
return;
}
return results.success.push(validationMethod);
});
}
return results;
*/
// Validate the form by going through all child input components
// and check their state
validateForm: function () {

2
release/formsy-react.min.js vendored
View File

File diff suppressed because one or more lines are too long

80
src/main.js
View File

@ -93,7 +93,7 @@ Formsy.Form = React.createClass({
this.updateModel();
var model = this.mapModel();
this.props.onSubmit(model, this.resetModel, this.updateInputsWithError);
this.state.isValid ? this.props.onValidSubmit(model, this.resetModel, this.updateInputsWithError) : this.props.onInvalidSubmit(model, this.resetModel, this.updateInputsWithError);
this.state.isValid ? this.props.onValidSubmit(model, this.resetModel) : this.props.onInvalidSubmit(model, this.resetModel);
return;
}
@ -273,6 +273,10 @@ Formsy.Form = React.createClass({
return '';
}
if (validationResults.errors.length) {
return validationResults.errors[0];
}
if (this.props.validationErrors && this.props.validationErrors[component.props.name]) {
return this.props.validationErrors[component.props.name];
}
@ -293,6 +297,7 @@ Formsy.Form = React.createClass({
runRules: function (value, currentValues, validations) {
var results = {
errors: [],
failed: [],
success: []
};
@ -307,10 +312,28 @@ Formsy.Form = React.createClass({
throw new Error('Formsy does not have the validation rule: ' + validationMethod);
}
if (typeof validations[validationMethod] === 'function' && !validations[validationMethod](currentValues, value)) {
return results.failed.push(validationMethod);
} else if (typeof validations[validationMethod] !== 'function' && !validationRules[validationMethod](currentValues, value, validations[validationMethod])) {
return results.failed.push(validationMethod);
if (typeof validations[validationMethod] === 'function') {
var validation = validations[validationMethod](currentValues, value);
if (typeof validation === 'string') {
results.errors.push(validation);
results.failed.push(validationMethod);
} else if (!validation) {
results.failed.push(validationMethod);
}
return;
} else if (typeof validations[validationMethod] !== 'function') {
var validation = validationRules[validationMethod](currentValues, value, validations[validationMethod]);
if (typeof validation === 'string') {
results.errors.push(validation);
results.failed.push(validationMethod);
} else if (!validation) {
results.failed.push(validationMethod);
} else {
results.success.push(validationMethod);
}
return;
}
return results.success.push(validationMethod);
@ -322,6 +345,53 @@ Formsy.Form = React.createClass({
},
/*
var results = {
errors: [],
failed: [],
success: []
};
if (Object.keys(validations).length) {
Object.keys(validations).forEach(function (validationMethod) {
if (validationRules[validationMethod] && typeof validations[validationMethod] === 'function') {
throw new Error('Formsy does not allow you to override default validations: ' + validationMethod);
}
if (!validationRules[validationMethod] && typeof validations[validationMethod] !== 'function') {
throw new Error('Formsy does not have the validation rule: ' + validationMethod);
}
if (typeof validations[validationMethod] === 'function') {
var validation = validations[validationMethod](currentValues, value);
if (typeof validation === 'string') {
results.errors.push(validation);
results.failed.push(validationMethod);
} else if (!validation) {
results.failed.push(validationMethod);
}
return;
} else if (typeof validations[validationMethod] !== 'function') {
var validation = validationRules[validationMethod](currentValues, value, validations[validationMethod]);
if (typeof validation === 'string') {
results.errors.push(validation);
results.failed.push(validationMethod);
} else if (!validation) {
results.failed.push(validationMethod);
}
return;
}
return results.success.push(validationMethod);
});
}
return results;
*/
// Validate the form by going through all child input components
// and check their state
validateForm: function () {