Merge pull request #653 from mewtaylor/issue/gh-642-validation-msg

Fix GH-642: Use empty default object for validation factory

Merge pull request #653 from mewtaylor/issue/gh-642-validation-msg
Fix GH-642: Use empty default object for validation factory
262569c7 · Matthew Taylor · GitHub · 5b288e4d · 6db426a5 · 262569c7
Commit 262569c7 authored Jun 30, 2016 by Matthew Taylor Committed by GitHub Jun 30, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

src/components/forms/validations.jsx src/components/forms/validations.jsx +3 -2

No files found.
--- a/src/components/forms/validations.jsx
+++ b/src/components/forms/validations.jsx
@@ -29,8 +29,9 @@ module.exports.validationHOCFactory = function (defaultValidationErrors) {
        var ValidatedComponent = React.createClass({
            render: function () {
                var validationErrors = defaults(
-                    this.props.validationErrors,
-                    defaultValidationErrors
+                    {},
+                    defaultValidationErrors,
+                    this.props.validationErrors
                );
                return (
                    <Component {...this.props} validationErrors={validationErrors} />