opendev/gerrit
Code Issues Proposed changes

Merge "Refactor promise chains to avoid .finally"

Browse Source
This commit is contained in:
Wyatt Allen 2018-08-28 19:46:31 +00:00 committed by Gerrit Code Review
commit 9139ca0e80
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.js
View File

@ -224,7 +224,7 @@
this.$.reporting.dashboardDisplayed();
}).catch(err => {
console.warn(err);
}).finally(() => { this._loading = false; });
}).then(() => { this._loading = false; });
},
/**

25
polygerrit-ui/app/elements/diff/gr-diff/gr-diff.js
View File

@ -254,17 +254,20 @@
return this._loadDiffAssets(diff);
});
return Promise.all([diffRequest, assetRequest]).then(results => {
const diff = results[0];
if (!diff) {
return Promise.resolve();
}
this.filesWeblinks = this._getFilesWeblinks(diff);
this._diff = diff;
return this._renderDiffTable();
}).finally(() => {
this._loading = false;
});
return Promise.all([diffRequest, assetRequest])
.then(results => {
const diff = results[0];
if (!diff) {
return Promise.resolve();
}
this.filesWeblinks = this._getFilesWeblinks(diff);
this._diff = diff;
return this._renderDiffTable();
})
.catch(err => {
console.warn('Error encountered loading diff:', err);
})
.then(() => { this._loading = false; });
},
/** Cancel any remaining diff builder rendering work. */