validation mixin small fixes

This commit is contained in:
Edin Dazdarevic
2015-02-26 07:28:27 +01:00
parent 42f2343cec
commit 6e327c758f
3 changed files with 66 additions and 21 deletions

View File

@@ -1,40 +1,54 @@
var RibicaValidationMixin = {
_updateState: function(prop, value) {
_updateState: function(prop, value, callback) {
var newState = {};
newState[prop] = value;
this.setState(newState);
this.setState(newState, function(){
if(callback) {
callback();
}
}.bind(this));
},
_validate: function(prop, value) {
if(this.validations && this.validations[prop]) {
var cb = function(err) {
var cb = function(err, revalidateFields) {
var errors = this.state.errors;
if (err !== undefined) {
var errors = this.state.errors;
if(err.length > 0) {
errors[prop] = err;
} else {
delete errors[prop];
}
this.setState({errors: errors});
} else {
delete errors[prop];
}
this.setState({errors: errors});
if (revalidateFields) {
for(var i = 0; i < revalidateFields.length; i++) {
this.validateField(revalidateFields[i], this.state[revalidateFields[i]]);
}
}
}.bind(this);
var immediateErrors = this.validations[prop](value, cb);
if(immediateErrors !== undefined) {
cb(immediateErrors);
}
cb(immediateErrors);
}
},
handleChange: function(prop) {
return function(event) {
event.preventDefault();
this._updateState(prop, event.target.value);
this._validate(prop, event.target.value);
var target = event.target;
this._updateState(prop, target.value, function(){
this._validate(prop, target.value);
}.bind(this));
}.bind(this);
},
getValidationMessages:function(prop) {
return (this.state.errors[prop] || []);
},
validateField: function(field) {
this._validate(field, this.state[field]);
},
validate: function() {
for (var key in this.state) {
if (this.state.hasOwnProperty(key)) {
@@ -45,7 +59,15 @@ var RibicaValidationMixin = {
},
isValid: function() {
return Object.keys(this.state.errors).length === 0;
}
},
componentDidMount : function(){
if (this.validations) {
var self = this;
this.validations.getState = function() {
return self.state;
};
}
},
};
module.exports = RibicaValidationMixin;