Commit 1045e621 authored by Matthew Taylor's avatar Matthew Taylor Committed by GitHub

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

Fix GH-617: switch ordering in defaults
parents d973d905 f2b8e902
...@@ -29,8 +29,8 @@ module.exports.validationHOCFactory = function (defaultValidationErrors) { ...@@ -29,8 +29,8 @@ module.exports.validationHOCFactory = function (defaultValidationErrors) {
var ValidatedComponent = React.createClass({ var ValidatedComponent = React.createClass({
render: function () { render: function () {
var validationErrors = defaults( var validationErrors = defaults(
defaultValidationErrors, this.props.validationErrors,
this.props.validationErrors defaultValidationErrors
); );
return ( return (
<Component {...this.props} validationErrors={validationErrors} /> <Component {...this.props} validationErrors={validationErrors} />
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment