Skip to content

Commit bdc3430

Browse files
committed
Merge branch 'v1.1.0-dev' of github.com:jakezatecky/react-checkbox-tree into v1.1-dev
2 parents 2229397 + 27bf3b2 commit bdc3430

17 files changed

+32238
-32247
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ insert_final_newline = true
1414
trim_trailing_whitespace = false
1515

1616
[*.js]
17-
indent_style = tab
17+
indent_size = 4

.eslintrc

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
{
2-
"extends": "airbnb",
3-
"parser": "babel-eslint",
4-
"rules": {
5-
"class-methods-use-this": 0,
6-
"indent": [2, "tab"],
7-
"no-tabs": 0,
8-
"react/jsx-indent": [2, "tab"],
9-
"react/jsx-indent-props" : [2, "tab"],
10-
"react/jsx-filename-extension": 0,
11-
"react/sort-prop-types": [2, {
12-
"callbacksLast": true,
13-
"requiredFirst": true
14-
}]
15-
},
2+
"extends": "takiyon-react",
163
"env": {
174
"browser": true,
185
"mocha": true

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: node_js
22
node_js:
33
- '6'
44
- '7'
5+
- '8'
56
before_script:
67
# Remove ./node_modules/.bin from PATH so node-which doesn't replace Unix which and cause RVM to barf. See https://github.com/travis-ci/travis-ci/issues/5092
78
- PATH=${PATH//:\.\/node_modules\/\.bin/}

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![npm](https://img.shields.io/npm/v/react-checkbox-tree.svg?style=flat-square)](https://www.npmjs.com/package/react-checkbox-tree)
44
[![Build Status](https://img.shields.io/travis/jakezatecky/react-checkbox-tree/master.svg?style=flat-square)](https://travis-ci.org/jakezatecky/react-checkbox-tree)
55
[![Dependency Status](https://img.shields.io/david/jakezatecky/react-checkbox-tree.svg?style=flat-square)](https://david-dm.org/jakezatecky/react-checkbox-tree)
6-
[![devDependency Status](https://david-dm.org/jakezatecky/react-checkbox-tree/dev-status.svg?style=flat-square)](https://david-dm.org/jakezatecky/react-checkbox-tree#info=devDependencies)
6+
[![devDependency Status](https://david-dm.org/jakezatecky/react-checkbox-tree/dev-status.svg?style=flat-square)](https://david-dm.org/jakezatecky/react-checkbox-tree?type=dev)
77
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://raw.githubusercontent.com/jakezatecky/react-checkbox-tree/master/LICENSE.txt)
88

99
> A simple and elegant checkbox tree for React.
@@ -110,8 +110,9 @@ Individual nodes within the `nodes` property can have the following structure:
110110

111111
| Property | Type | Description |
112112
| ----------- | ------ | ------------------------------- |
113-
| `label` | string | **Required**. The node's label. |
113+
| `label` | mixed | **Required**. The node's label. |
114114
| `value` | mixed | **Required**. The node's value. |
115115
| `children` | array | An array of child nodes. |
116116
| `className` | string | A className to add to the node. |
117+
| `disabled` | bool | Disable node. |
117118
| `icon` | mixed | A custom icon for the node. |

0 commit comments

Comments
 (0)