diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-15 05:35:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-15 05:35:45 +0100 |
commit | c20d096e6a251e1b84ac47b751d2eb065743dbc2 (patch) | |
tree | f3e9fa961ba9170e1a70b3854bbe0711ec560b2f /app/javascript/mastodon/containers/mastodon.js | |
parent | ff565524aa6aa35c07557ea02d8d04bb3a9e1a97 (diff) |
Show disappointed elephant if web UI crashes (#10275)
* Do not crash the whole UI when loading an invalid column * Add error boundary component to catch Web UI crashes * Add stack trace on supported browsers * Add component stack info, pre-format everything for github * Make “Reload” a clickable link that calls window.location.reload() * Remove elephant friend from error boundary, make title stand out more * Simplify error boundary to only a graphic
Diffstat (limited to 'app/javascript/mastodon/containers/mastodon.js')
-rw-r--r-- | app/javascript/mastodon/containers/mastodon.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/javascript/mastodon/containers/mastodon.js b/app/javascript/mastodon/containers/mastodon.js index 2912540a0..542b68282 100644 --- a/app/javascript/mastodon/containers/mastodon.js +++ b/app/javascript/mastodon/containers/mastodon.js @@ -13,6 +13,7 @@ import { connectUserStream } from '../actions/streaming'; import { IntlProvider, addLocaleData } from 'react-intl'; import { getLocale } from '../locales'; import initialState from '../initial_state'; +import ErrorBoundary from '../components/error_boundary'; const { localeData, messages } = getLocale(); addLocaleData(localeData); @@ -75,7 +76,9 @@ export default class Mastodon extends React.PureComponent { return ( <IntlProvider locale={locale} messages={messages}> <Provider store={store}> - <MastodonMount /> + <ErrorBoundary> + <MastodonMount /> + </ErrorBoundary> </Provider> </IntlProvider> ); |