Merge branch 'fix-thumbs-award-loading-toggle' into 'master'
Fix awardable button mutuality loading spinners ## What does this MR do? Removes the showing and hiding of loading spinners when an awardable's opposite button is selected. ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Makes the UI more consistent. Reduces confusion of why another button is showing the loading spinner when it was not clicked on. ## What are the relevant issue numbers? Closes #18380 ## Screenshots (if relevant) Before: ![loading](/uploads/d4c4e565fa58fbbf3db6ed8e28f9abb0/loading.gif) After: ![CcwRYZcUVm](/uploads/b93fd04853f43a6c70de3cefb20d08a1/CcwRYZcUVm.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5745
This commit is contained in:
commit
928edde2e6
|
@ -18,6 +18,7 @@ v 8.11.0 (unreleased)
|
|||
- Expand commit message width in repo view (ClemMakesApps)
|
||||
- Cache highlighted diff lines for merge requests
|
||||
- Fix of 'Commits being passed to custom hooks are already reachable when using the UI'
|
||||
- Fix awardable button mutuality loading spinners (ClemMakesApps)
|
||||
- Add support for using RequestStore within Sidekiq tasks via SIDEKIQ_REQUEST_STORE env variable
|
||||
- Optimize maximum user access level lookup in loading of notes
|
||||
- Add "No one can push" as an option for protected branches. !5081
|
||||
|
|
|
@ -161,23 +161,11 @@
|
|||
$emojiButton = votesBlock.find("[data-emoji=" + mutualVote + "]").parent();
|
||||
isAlreadyVoted = $emojiButton.hasClass('active');
|
||||
if (isAlreadyVoted) {
|
||||
this.showEmojiLoader($emojiButton);
|
||||
return this.addAward(votesBlock, awardUrl, mutualVote, false, function() {
|
||||
return $emojiButton.removeClass('is-loading');
|
||||
});
|
||||
this.addAward(votesBlock, awardUrl, mutualVote, false);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
AwardsHandler.prototype.showEmojiLoader = function($emojiButton) {
|
||||
var $loader;
|
||||
$loader = $emojiButton.find('.fa-spinner');
|
||||
if (!$loader.length) {
|
||||
$emojiButton.append('<i class="fa fa-spinner fa-spin award-control-icon award-control-icon-loading"></i>');
|
||||
}
|
||||
return $emojiButton.addClass('is-loading');
|
||||
};
|
||||
|
||||
AwardsHandler.prototype.isActive = function($emojiButton) {
|
||||
return $emojiButton.hasClass('active');
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue