Skip to content
This repository was archived by the owner on Mar 1, 2024. It is now read-only.

Merge from ismaelga/plexus-form #13

Merged
merged 7 commits into from
Jan 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/plexus-form.min.js

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions dist/react-json-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -823,12 +823,18 @@ return /******/ (function(modules) { // webpackBootstrap
};

exports.section = function(props, fields) {
if (React.isValidElement(props.sectionWrapper)) {
return React.cloneElement(props.sectionWrapper, propsForWrapper(props, true), fields);
}
return React.createElement(props.sectionWrapper || SectionWrapper,
propsForWrapper(props, true),
fields);
};

exports.field = function(props, field) {
if (React.isValidElement(props.fieldWrapper)) {
return React.cloneElement(props.fieldWrapper, propsForWrapper(props), field);
}
return React.createElement(props.fieldWrapper || FieldWrapper,
propsForWrapper(props),
field);
Expand Down
2 changes: 1 addition & 1 deletion lib/alternative.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ exports.schema = function(value, schema, context) {
var dereferenced = schema.oneOf.map(function(alt) {
return resolve(alt, context);
});

options = dereferenced.map(function(alt) {
return ou.getIn(alt, [ 'properties', selector, 'enum', 0 ]) || "";
});
Expand Down
2 changes: 1 addition & 1 deletion lib/fields/checkbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var CheckBox = React.createClass({
displayName: 'CheckBox',

handleChange: function(event) {
var val = event.target.checked;
var val = event.target.checked ? true : null;
this.props.update(this.props.path, val, val);
},
render: function() {
Expand Down
1 change: 0 additions & 1 deletion lib/fields/input.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,3 @@ var InputField = React.createClass({
});

module.exports = InputField;

6 changes: 6 additions & 0 deletions lib/fields/utils/wrapped.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,18 @@ var propsForWrapper = function(props, section) {
};

exports.section = function(props, fields) {
if (React.isValidElement(props.sectionWrapper)) {
return React.cloneElement(props.sectionWrapper, propsForWrapper(props, true), fields);
}
return React.createElement(props.sectionWrapper || SectionWrapper,
propsForWrapper(props, true),
fields);
};

exports.field = function(props, field) {
if (React.isValidElement(props.fieldWrapper)) {
return React.cloneElement(props.fieldWrapper, propsForWrapper(props), field);
}
return React.createElement(props.fieldWrapper || FieldWrapper,
propsForWrapper(props),
field);
Expand Down
4 changes: 2 additions & 2 deletions lib/types.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ var types = {
},
array: function(fields, props) {
var move = function(props, i, n) {
return function(to) {
return function(to) {
if(!canMoveUp(i, n) && !canMoveDown(i, n)) return;
var newList = props.getValue(props.path);
var value = newList.splice(to, 1);

newList.splice(i, 0, value[0]);
props.update(props.path, newList, newList);
};
};
};
var canMoveUp = function(i, n) {
return i > 0 && i < n - 1;
};
Expand Down