Skip to content

Commit 621ea7d

Browse files
oxyno-zetaoxyno-zeta
committed
Merged branch develop into master
2 parents 3777369 + d7c088b commit 621ea7d

16 files changed

+6507
-143
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,4 +235,3 @@ tramp
235235
# Project
236236
dist/
237237
dev_build/
238-
yarn.lock

‎dev/App.jsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
/* ************************************* */
77
/* ******** IMPORTS ******** */
88
/* ************************************* */
9-
import React, { Component } from 'react';
10-
import Header from './components/Header.jsx';
11-
import Footer from './components/Footer.jsx';
12-
import Body from './components/Body.jsx';
9+
import React, {Component} from 'react'
10+
import Header from './components/Header.jsx'
11+
import Footer from './components/Footer.jsx'
12+
import Body from './components/Body.jsx'
1313

1414
/* ************************************* */
1515
/* ******** VARIABLES ******** */

‎dev/components/Body.jsx‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
/* ************************************* */
77
/* ******** IMPORTS ******** */
88
/* ************************************* */
9-
import React, { Component } from 'react';
10-
import _ from 'lodash';
11-
import { JsonTree } from '../../src/JsonTree.js';
9+
import React, {Component} from 'react'
10+
import _ from 'lodash'
11+
import {JsonTree} from '../../src/JsonTree.js'
1212

1313
/* ************************************* */
1414
/* ******** VARIABLES ******** */
@@ -103,13 +103,17 @@ class Body extends Component {
103103
}
104104

105105
refReadOnlyFunctionCheckbox(node) {
106-
this.state.readOnlyFunctionRef = node;
107-
this.state.readOnlyFunctionRef.disabled = true;
106+
if (node) {
107+
this.state.readOnlyFunctionRef = node;
108+
this.state.readOnlyFunctionRef.disabled = true;
109+
}
108110
}
109111

110112
refReadOnlyBooleanCheckbox(node) {
111-
this.state.readOnlyBooleanRef = node;
112-
this.state.readOnlyBooleanRef.disabled = true;
113+
if (node) {
114+
this.state.readOnlyBooleanRef = node;
115+
this.state.readOnlyBooleanRef.disabled = true;
116+
}
113117
}
114118

115119
refReadOnlyCheckbox(node) {
@@ -121,7 +125,7 @@ class Body extends Component {
121125
}
122126

123127
handleChangeMinusMenu() {
124-
const { minusMenuRef } = this.state;
128+
const {minusMenuRef} = this.state;
125129

126130
this.setState({
127131
minusMenu: minusMenuRef.checked,
@@ -133,15 +137,15 @@ class Body extends Component {
133137
}
134138

135139
handleChangeCustomInput() {
136-
const { customInputRef } = this.state;
140+
const {customInputRef} = this.state;
137141

138142
this.setState({
139143
customInput: customInputRef.checked,
140144
});
141145
}
142146

143147
handleSubmit() {
144-
const { textareaRef } = this.state;
148+
const {textareaRef} = this.state;
145149
// Get data
146150
const jsonString = textareaRef.value;
147151

@@ -165,7 +169,7 @@ class Body extends Component {
165169
}
166170

167171
handleChangeReadOnly() {
168-
const { readOnlyRef, readOnlyBooleanRef, readOnlyFunctionRef } = this.state;
172+
const {readOnlyRef, readOnlyBooleanRef, readOnlyFunctionRef} = this.state;
169173

170174
this.setState({
171175
readOnlyEnable: readOnlyRef.checked,
@@ -189,7 +193,7 @@ class Body extends Component {
189193
}
190194

191195
handleChangeReadOnlyBoolean() {
192-
const { readOnlyBooleanRef, readOnlyFunctionRef } = this.state;
196+
const {readOnlyBooleanRef, readOnlyFunctionRef} = this.state;
193197

194198
readOnlyFunctionRef.disabled = readOnlyBooleanRef.checked;
195199

@@ -199,7 +203,7 @@ class Body extends Component {
199203
}
200204

201205
handleChangeReadOnlyFunction() {
202-
const { readOnlyFunctionRef, readOnlyBooleanRef } = this.state;
206+
const {readOnlyFunctionRef, readOnlyBooleanRef} = this.state;
203207

204208
readOnlyBooleanRef.disabled = readOnlyFunctionRef.checked;
205209

@@ -228,7 +232,7 @@ class Body extends Component {
228232
}
229233

230234
render() {
231-
const { json, deltaUpdateString, globalUpdateString, readOnly, customInput, minusMenu } = this.state;
235+
const {json, deltaUpdateString, globalUpdateString, readOnly, customInput, minusMenu} = this.state;
232236

233237
const style1 = {
234238
width: '100%',

‎docs/app-a3d7f.js‎

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

‎docs/app-a3d7f.js.map‎

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

‎docs/app-ed03b.js‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎docs/app-ed03b.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/index.html‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,12 @@
1-
<!DOCTYPE html> <html lang=en> <head> <meta charset=UTF-8> <title>React Editable Json Tree</title> </head> <body style=margin:0> <div id=app></div> <script type="text/javascript" src="vendor.bundle.js"></script><script type="text/javascript" src="app-ed03b.js"></script></body> </html>
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<title>React Editable Json Tree</title>
6+
</head>
7+
<body style="margin: 0;">
8+
9+
<div id="app"></div>
10+
11+
<script type="text/javascript" src="vendor.bundle.js"></script><script type="text/javascript" src="app-a3d7f.js"></script></body>
12+
</html>

‎docs/vendor.bundle.js‎

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

‎docs/vendor.bundle.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)