From b73bd17a691a61c2d8fb5edebc7625767e5f82c3 Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Wed, 16 Nov 2022 00:04:59 -0700 Subject: [PATCH 1/2] Always hide the loader spinner when clicking a tab Some of the tab panels implement their own spinners. Changelog: fixed --- app/assets/javascripts/merge_request_tabs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 0ddf5def8ee571..ba5d6f1f22adf5 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -261,6 +261,8 @@ export default class MergeRequestTabs { } tabShown(action, href, shouldScroll = true) { + toggleLoader(false); + if (action !== this.currentTab && this.mergeRequestTabs) { this.currentTab = action; -- GitLab From 87c2da82828800bfc3c7b99c0c2febadb293f12f Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Wed, 16 Nov 2022 00:05:36 -0700 Subject: [PATCH 2/2] Don't show the spinner when loading diffs The diffs app implements its own spinner, so the tabs don't need to show one. --- app/assets/javascripts/merge_request_tabs.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index ba5d6f1f22adf5..fb52ed9a571a76 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -479,8 +479,6 @@ export default class MergeRequestTabs { return; } - toggleLoader(true); - loadDiffs({ // We extract pathname for the current Changes tab anchor href // some pages like MergeRequestsController#new has query parameters on that anchor @@ -498,9 +496,6 @@ export default class MergeRequestTabs { createAlert({ message: __('An error occurred while fetching this tab.'), }); - }) - .finally(() => { - toggleLoader(false); }); } -- GitLab