PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1333 from matrix-org/dbkr/fix_uncaught_exception_if_no_scalar

Browse source 
Catch the promise rejection if scalar fails
This commit is contained in:
David Baker 2017-08-24 09:45:51 +01:00 committed by GitHub
commit 737a258944
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/rooms/AppsDrawer.js
View file

@ -53,11 +53,11 @@ module.exports = React.createClass({
this.scalarClient = null; this.scalarClient = null;
if (SdkConfig.get().integrations_ui_url && SdkConfig.get().integrations_rest_url) { if (SdkConfig.get().integrations_ui_url && SdkConfig.get().integrations_rest_url) {
this.scalarClient = new ScalarAuthClient(); this.scalarClient = new ScalarAuthClient();
this.scalarClient.connect().done(() => { this.scalarClient.connect().then(() => {
this.forceUpdate(); this.forceUpdate();
}).catch((e) => {
console.log("Failed to connect to integrations server");
// TODO -- Handle Scalar errors // TODO -- Handle Scalar errors
// },
// (err) => {
// this.setState({ // this.setState({
// scalar_error: err, // scalar_error: err,
// }); // });