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

fix nightmarish underscore-versus-camelcase confusion in propTypes, and track default URLs for placeholder content

pull/21833/head
Matthew Hodgson 2015-11-11 00:04:30 +01:00
parent 368c24e146
commit d0a4f908cf
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/controllers/molecules/ServerConfig.js
View File

@ -22,8 +22,8 @@ module.exports = {
propTypes: { propTypes: {
onHsUrlChanged: React.PropTypes.func, onHsUrlChanged: React.PropTypes.func,
onIsUrlChanged: React.PropTypes.func, onIsUrlChanged: React.PropTypes.func,
default_hs_url: React.PropTypes.string, defaultHsUrl: React.PropTypes.string,
default_is_url: React.PropTypes.string defaultIsUrl: React.PropTypes.string
}, },
getDefaultProps: function() { getDefaultProps: function() {
@ -39,6 +39,8 @@ module.exports = {
return { return {
hs_url: this.props.defaultHsUrl, hs_url: this.props.defaultHsUrl,
is_url: this.props.defaultIsUrl, is_url: this.props.defaultIsUrl,
original_hs_url: this.props.defaultHsUrl,
original_is_url: this.props.defaultIsUrl,
} }
}, },