M-Labs
/
web2019
5
0
Fork 2
Code Issues 20 Pull Requests 3 Releases Wiki Activity

Fixes text clearing in "Import JSON" #49

Merged
sb10q merged 1 commits from occheung/web2019:fix-text-clear into master 2021-06-02 09:07:13 +08:00
Conversation 1 Commits 1 Files Changed 2 +2 -10
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8c3a35cea4 - Show all commits

6
static/js/shop.jsx
View File

@ -183,10 +183,6 @@ class Layout extends React.PureComponent {
checkValidation(conf) {
let conf_obj;
if (!conf) {
conf = this.state.customconf;
}
try {
conf_obj = JSON.parse(conf);
} catch (e) {
@ -281,7 +277,7 @@ class Layout extends React.PureComponent {
}
handleClickLoad() {
this.checkValidation();
this.checkValidation(this.state.customconf);
if (this.props.onClickLoadCustomConf) {
this.props.onClickLoadCustomConf(this.state.customconf_ready);

6
static/js/shop.min.js vendored
View File

@ -227,10 +227,6 @@ var Layout = /*#__PURE__*/function (_React$PureComponent) {
value: function checkValidation(conf) {
var conf_obj;
if (!conf) {
conf = this.state.customconf;
}
try {
conf_obj = JSON.parse(conf);
} catch (e) {
@ -315,7 +311,7 @@ var Layout = /*#__PURE__*/function (_React$PureComponent) {
}, {
key: "handleClickLoad",
value: function handleClickLoad() {
this.checkValidation();
this.checkValidation(this.state.customconf);
if (this.props.onClickLoadCustomConf) {
this.props.onClickLoadCustomConf(this.state.customconf_ready);