diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-04-16 16:36:24 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-16 16:36:24 +0100 |
commit | 4b2ff003920cff431ef4e3e8b0436aa924b34fda (patch) | |
tree | 5c7b6aaece691736dcc3997e735680da33f83ccb /app/assets/javascripts/notes.js | |
parent | 8f189df86f6ebd2bd4974ce180ed75e9d97cd81e (diff) | |
download | gitlab-ce-4b2ff003920cff431ef4e3e8b0436aa924b34fda.tar.gz |
Disable try again button while fetching the API
Diffstat (limited to 'app/assets/javascripts/notes.js')
-rw-r--r-- | app/assets/javascripts/notes.js | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index a4669b1672a..a07af3ee93a 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -197,7 +197,7 @@ export default class Notes { ); this.$wrapperEl.on('click', '.js-toggle-lazy-diff', this.loadLazyDiff); - this.$wrapperEl.on('click', '.js-toggle-lazy-diff-retry-button', this.loadLazyDiff); + this.$wrapperEl.on('click', '.js-toggle-lazy-diff-retry-button', this.onClickRetryLazyLoad.bind(this)); // fetch notes when tab becomes visible this.$wrapperEl.on('visibilitychange', this.visibilityChange); @@ -1433,6 +1433,17 @@ export default class Notes { syntaxHighlight(fileHolder); } + onClickRetryLazyLoad(e) { + const $retryButton = $(e.currentTarget); + + $retryButton.prop('disabled', true); + + return this.loadLazyDiff(e) + .then(() => { + $retryButton.prop('disabled', false); + }); + } + loadLazyDiff(e) { const $container = $(e.currentTarget).closest('.js-toggle-container'); Notes.renderPlaceholderComponent($container); @@ -1453,7 +1464,7 @@ export default class Notes { * Unresolved discussions don't have an endpoint being provided. */ if (url) { - axios + return axios .get(url) .then(({ data }) => { // Reset state in case last request returned error @@ -1467,6 +1478,7 @@ export default class Notes { $errorContainer.removeClass('hidden'); }); } + return Promise.resolve(); } toggleCommitList(e) { |