Skip to content

Commit 871c30e

Browse files
oxyno-zetaoxyno-zeta
committed
Merged branch master into develop
2 parents f701984 + 93c1770 commit 871c30e

File tree

4 files changed

+50
-44
lines changed

4 files changed

+50
-44
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11

2+
# 1.3.1
3+
## Fix
4+
- Fix README for Github
5+
6+
## Code
7+
- Fix Dependencies
8+
29
# 1.3.0
310
## Feature
411
- Add way to pass plus and minus menu element

‎README.md‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ There is a screenshot of the result :
6969
| rootName | Root name for first object | String | False | root |
7070

7171
### isCollapsed
72-
| Key | Description | Type | Required | Default |
73-
|:-----------:|:--------------------------------------------:|:--------:|:---------:|:-------------------------------:|
74-
| isCollapsed | Is node collapsed ? (For Array/Object/Error) | Function | False | (keyPath, deep) => (deep !== 0) |
72+
| Key | Description | Type | Required | Default |
73+
|:-----------:|:--------------------------------------------:|:--------:|:---------:|:---------------------------------:|
74+
| isCollapsed | Is node collapsed ? (For Array/Object/Error) | Function | False | `(keyPath, deep) => (deep !== 0)` |
7575

7676
Function parameters :
7777

@@ -81,9 +81,9 @@ Function parameters :
8181
| deep | Deep of current node | Number | 1 for data: { object: { string: 'test' } } on 'object' node |
8282

8383
### onFullyUpdate
84-
| Key | Description | Type | Required | Default |
85-
|:-------------:|:---------------------------------------------------------------------:|:--------:|:---------:|:--------:|
86-
| onFullyUpdate | Function called each time an update is done and give the updated data | Function | False | () => {} |
84+
| Key | Description | Type | Required | Default |
85+
|:-------------:|:---------------------------------------------------------------------:|:--------:|:---------:|:----------:|
86+
| onFullyUpdate | Function called each time an update is done and give the updated data | Function | False | `() => {}` |
8787

8888
Function parameters :
8989

@@ -92,9 +92,9 @@ Function parameters :
9292
| data | Updated data | Object/Array (Same as entry) |
9393

9494
### onDeltaUpdate
95-
| Key | Description | Type | Required | Default |
96-
|:-------------:|:-----------------------------------------------------------------:|:--------:|:---------:|:--------:|
97-
| onDeltaUpdate | Function called each time an update is done and give delta update | Function | False | () => {} |
95+
| Key | Description | Type | Required | Default |
96+
|:-------------:|:-----------------------------------------------------------------:|:--------:|:---------:|:----------:|
97+
| onDeltaUpdate | Function called each time an update is done and give delta update | Function | False | `() => {}` |
9898

9999
Function parameters :
100100

@@ -119,9 +119,9 @@ Delta data structure :
119119
| readOnly | Read only boolean for all object | Boolean | False | false |
120120

121121
### getStyle
122-
| Key | Description | Type | Required | Default |
123-
|:-----------:|:--------------------:|:--------:|:---------:|:-------------------------------------------------:|
124-
| getStyle | Get style (CSS keys) | Function | False | (keyName, data, keyPath, deep, dataType) => {...} |
122+
| Key | Description | Type | Required | Default |
123+
|:-----------:|:--------------------:|:--------:|:---------:|:---------------------------------------------------:|
124+
| getStyle | Get style (CSS keys) | Function | False | `(keyName, data, keyPath, deep, dataType) => {...}` |
125125

126126
Function parameters :
127127

@@ -162,51 +162,51 @@ You can see the actual used in `src/utils/styles.js`.
162162
### addButtonElement
163163
| Key | Description | Type | Required | Default |
164164
|:----------------:|:-----------------------------------------:|:-----------:|:--------:|:---------------------:|
165-
| addButtonElement | Add button Element to replace library one | Element | False | <button>+</button> |
165+
| addButtonElement | Add button Element to replace library one | Element | False | `<button>+</button>` |
166166

167167
The library will add a `onClick` props on element.
168168

169169
### cancelButtonElement
170170
| Key | Description | Type | Required | Default |
171171
|:-------------------:|:--------------------------------------------:|:-----------:|:--------:|:---------------------:|
172-
| cancelButtonElement | Cancel button Element to replace library one | Element | False | <button>c</button> |
172+
| cancelButtonElement | Cancel button Element to replace library one | Element | False | `<button>c</button>` |
173173

174174
The library will add a `onClick` props on element.
175175

176176
### editButtonElement
177177
| Key | Description | Type | Required | Default |
178178
|:-----------------:|:------------------------------------------:|:-----------:|:--------:|:---------------------:|
179-
| editButtonElement | Edit button Element to replace library one | Element | False | <button>e</button> |
179+
| editButtonElement | Edit button Element to replace library one | Element | False | `<button>e</button>` |
180180

181181
The library will add a `onClick` props on element.
182182

183183
### inputElement
184184
| Key | Description | Type | Required | Default |
185185
|:------------:|:-----------------------------------------:|:-----------:|:--------:|:------------:|
186-
| inputElement | Input Text Element to replace library one | Element | False | <input /> |
186+
| inputElement | Input Text Element to replace library one | Element | False | `<input />` |
187187

188188
The library will add a `placeholder`, `ref`, `defaultValue` props on element.
189189
This item will be focus when possible.
190190

191191
### textareaElement
192-
| Key | Description | Type | Required | Default |
193-
|:---------------:|:-----------------------------------------:|:-----------:|:--------:|:------------:|
194-
| textareaElement | Textarea Element to replace library one | Element | False | <textarea /> |
192+
| Key | Description | Type | Required | Default |
193+
|:---------------:|:-----------------------------------------:|:-----------:|:--------:|:--------------:|
194+
| textareaElement | Textarea Element to replace library one | Element | False | `<textarea />` |
195195

196196
The library will add a `ref`, `defaultValue` props on element.
197197
This item will be focus when possible.
198198

199199
### minusMenuElement
200200
| Key | Description | Type | Required | Default |
201201
|:----------------:|:-----------------------------------------:|:-----------:|:--------:|:-------------------:|
202-
| minusMenuElement | Minus Menu Element to replace library one | Element | False | <span> - </span> |
202+
| minusMenuElement | Minus Menu Element to replace library one | Element | False | `<span> - </span>` |
203203

204204
The library will add a `onClick`, `className` and `style` props on element.
205205

206206
### plusMenuElement
207207
| Key | Description | Type | Required | Default |
208208
|:---------------:|:----------------------------------------:|:-----------:|:--------:|:-------------------:|
209-
| plusMenuElement | Plus Menu Element to replace library one | Element | False | <span> + </span> |
209+
| plusMenuElement | Plus Menu Element to replace library one | Element | False | `<span> + </span>` |
210210

211211
The library will add a `onClick`, `className` and `style` props on element.
212212

‎docs/bundle.js‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-editable-json-tree",
3-
"version": "1.3.0",
3+
"version": "1.3.1",
44
"description": "React Editable Json Tree",
55
"main": "dist/JsonTree.js",
66
"scripts": {
@@ -22,24 +22,23 @@
2222
"author": "Oxyno-zeta",
2323
"license": "See LICENSE.md",
2424
"devDependencies": {
25-
"babel-core": "^6.13.2",
26-
"babel-loader": "^6.2.5",
25+
"babel-core": "^6.18.2",
26+
"babel-loader": "^6.2.8",
2727
"babel-preset-es2015": "^6.13.2",
2828
"babel-preset-react": "^6.11.1",
2929
"babel-preset-react-hmre": "^1.1.1",
3030
"babel-preset-stage-0": "^6.16.0",
31-
"body-parser": "^1.15.2",
3231
"del": "^2.2.2",
33-
"eslint": "^3.8.1",
34-
"eslint-config-airbnb": "^12.0.0",
35-
"eslint-plugin-import": "^2.1.0",
36-
"eslint-plugin-jsx-a11y": "^2.2.3",
37-
"eslint-plugin-react": "^6.4.1",
32+
"eslint": "^3.10.2",
33+
"eslint-config-airbnb": "^13.0.0",
34+
"eslint-plugin-import": "^2.2.0",
35+
"eslint-plugin-jsx-a11y": "^3.0.1",
36+
"eslint-plugin-react": "^6.7.1",
3837
"gulp": "^3.9.1",
3938
"gulp-babel": "^6.1.2",
4039
"gulp-bump": "^2.5.0",
41-
"html-webpack-plugin": "^2.22.0",
42-
"lodash": "^4.16.6",
40+
"html-webpack-plugin": "^2.24.1",
41+
"lodash": "^4.17.2",
4342
"progress-bar-webpack-plugin": "^1.9.0",
4443
"react-hot-loader": "^1.3.0",
4544
"run-sequence": "^1.2.2",
@@ -48,8 +47,8 @@
4847
"webpack-stream": "^3.2.0"
4948
},
5049
"dependencies": {
51-
"react": "^15.3.1",
52-
"react-dom": "^15.3.1",
50+
"react": "^15.4.0",
51+
"react-dom": "^15.4.0",
5352
"react-hotkeys": "^0.9.0"
5453
}
5554
}

0 commit comments

Comments
 (0)