scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 09:35:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
Fix GH-617: switch ordering in defaults
This commit is contained in:
Matthew Taylor 2016-06-30 08:04:02 -04:00 committed by GitHub
commit 1045e6219e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/forms/validations.jsx
View file

@ -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} />