Remove unnecessary if in App.handleConfig
config.json is merged with baseConfig. The latter is guaranteed to contain a "server" field.
This commit is contained in:
parent
a13f74d466
commit
34d3bd6df9
1 changed files with 23 additions and 25 deletions
|
@ -254,7 +254,6 @@ export default class App extends Component {
|
||||||
|
|
||||||
let connectParams = { ...this.state.connectParams };
|
let connectParams = { ...this.state.connectParams };
|
||||||
|
|
||||||
if (config.server) {
|
|
||||||
if (typeof config.server.url === "string") {
|
if (typeof config.server.url === "string") {
|
||||||
connectParams.url = config.server.url;
|
connectParams.url = config.server.url;
|
||||||
}
|
}
|
||||||
|
@ -280,7 +279,6 @@ export default class App extends Component {
|
||||||
console.error("Error in config.json: cannot set server.autoconnect = true and server.auth = \"mandatory\"");
|
console.error("Error in config.json: cannot set server.autoconnect = true and server.auth = \"mandatory\"");
|
||||||
connectParams.autoconnect = false;
|
connectParams.autoconnect = false;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
let autoconnect = store.autoconnect.load();
|
let autoconnect = store.autoconnect.load();
|
||||||
if (autoconnect) {
|
if (autoconnect) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue