Merge pull request #632 from mewtaylor/issue/gh-618-login-style

Fix GH-617: switch ordering in defaults

Merge pull request #632 from mewtaylor/issue/gh-618-login-style
Fix GH-617: switch ordering in defaults
1045e621 · Matthew Taylor · GitHub · d973d905 · f2b8e902 · 1045e621
Commit 1045e621 authored Jun 30, 2016 by Matthew Taylor Committed by GitHub Jun 30, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

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