tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(components/bundle): Exit early in load function (#4349)

Browse Source
This commit is contained in:
Sorin Davidoi
2017-07-25 01:05:44 +02:00
committed by Eugen Rochko
parent de105d64d5
commit 23e854cb91
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/javascript/mastodon/features/ui/components/bundle.js
View File

@@ -52,14 +52,8 @@ class Bundle extends React.Component {
load = (props) => { load = (props) => {
const { fetchComponent, onFetch, onFetchSuccess, onFetchFail, renderDelay } = props || this.props; const { fetchComponent, onFetch, onFetchSuccess, onFetchFail, renderDelay } = props || this.props;
this.setState({ mod: undefined });
onFetch(); onFetch();
if (renderDelay !== 0) {
this.timestamp = new Date();
this.timeout = setTimeout(() => this.setState({ forceRender: true }), renderDelay);
}
if (Bundle.cache[fetchComponent.name]) { if (Bundle.cache[fetchComponent.name]) {
const mod = Bundle.cache[fetchComponent.name]; const mod = Bundle.cache[fetchComponent.name];
@@ -68,6 +62,13 @@ class Bundle extends React.Component {
return Promise.resolve(); return Promise.resolve();
} }
this.setState({ mod: undefined });
if (renderDelay !== 0) {
this.timestamp = new Date();
this.timeout = setTimeout(() => this.setState({ forceRender: true }), renderDelay);
}
return fetchComponent() return fetchComponent()
.then((mod) => { .then((mod) => {
Bundle.cache[fetchComponent.name] = mod; Bundle.cache[fetchComponent.name] = mod;