Conversation
Accept 404 errors from getting the config and start MatrixChat with no config, make other errors display a simple error message to prevent a completely blank page if the config does fail to load.
| if (this.props.brand) { | ||
| data['brand'] = this.props.brand; | ||
| } else if (this.props.brand === undefined) { | ||
| data['brand'] = 'Vector'; |
Member
There was a problem hiding this comment.
data['brand'] = this.props.brand || 'Vector' would probably be better here
(because the rendering isn't in a render method here)
Member
Author
|
done, ptal |
| @@ -120,9 +120,7 @@ module.exports = React.createClass({ | |||
| if (event.target.checked) { | |||
| var data = {} | |||
| if (this.props.brand) { | |||
Member
There was a problem hiding this comment.
this still doesn't look right. Lose this condition?
| // On 404 errors, carry on without a config, | ||
| // but on other errors, fail, otherwise it will | ||
| // lead to subtle errors where the app runs with | ||
| // the default config if fails to fetch config.json. |
Fix dave's typo for him
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Accept 404 errors from getting the config and start MatrixChat with no config, make other errors display a simple error message to prevent a completely blank page if the config does fail to load.
This allows us to move config.json to config.sample.json and not version config.json so people don't keep accidentally committing changes to config.json ;) (and vector will still work out of the box the same as it always has).