OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove if (this.props.config) 

Since it now defaults to the empty dictionary (and if you pass null in, you deserve everything you get).
pull/21833/head
David Baker 2016-06-09 09:53:37 +01:00
parent c123f02842
commit 05404efa34
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/MatrixChat.js
View File

@ -98,7 +98,7 @@ module.exports = React.createClass({
else if (window.localStorage && window.localStorage.getItem("mx_hs_url")) { else if (window.localStorage && window.localStorage.getItem("mx_hs_url")) {
return window.localStorage.getItem("mx_hs_url"); return window.localStorage.getItem("mx_hs_url");
} }
else if (this.props.config) { else {
return this.props.config.default_hs_url return this.props.config.default_hs_url
} }
return "https://matrix.org"; return "https://matrix.org";
@ -117,7 +117,7 @@ module.exports = React.createClass({
else if (window.localStorage && window.localStorage.getItem("mx_is_url")) { else if (window.localStorage && window.localStorage.getItem("mx_is_url")) {
return window.localStorage.getItem("mx_is_url"); return window.localStorage.getItem("mx_is_url");
} }
else if (this.props.config) { else {
return this.props.config.default_is_url return this.props.config.default_is_url
} }
return "https://matrix.org"; return "https://matrix.org";