summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRajat Jain <rjain@gitlab.com>2019-01-31 11:08:55 +0530
committerRajat Jain <rjain@gitlab.com>2019-01-31 17:29:20 +0530
commitf5a07117329f72142e560d5ebf1ebbfed39da36c (patch)
tree50db62902fa2d4d94dd641b67ae27740290d9621 /app
parentf60bf03f5cc4cb6eab9348d852fc4d0fa60c5650 (diff)
downloadgitlab-ce-f5a07117329f72142e560d5ebf1ebbfed39da36c.tar.gz
Append prioritized label before pagination
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/label_manager.js13
1 files changed, 12 insertions, 1 deletions
diff --git a/app/assets/javascripts/label_manager.js b/app/assets/javascripts/label_manager.js
index 062501d1d04..f134a54dd53 100644
--- a/app/assets/javascripts/label_manager.js
+++ b/app/assets/javascripts/label_manager.js
@@ -70,7 +70,18 @@ export default class LabelManager {
const $detachedLabel = $label.detach();
this.toggleLabelPriorityBadge($detachedLabel, action);
- $detachedLabel.appendTo($target);
+
+ const $labelEls = $target.find('li.label-list-item');
+
+ /*
+ * If there is a label element in the target, we'd want to
+ * append the new label just right next to it.
+ */
+ if ($labelEls.length) {
+ $labelEls.last().after($detachedLabel);
+ } else {
+ $detachedLabel.appendTo($target);
+ }
if ($from.find('li').length) {
$from.find('.empty-message').removeClass('hidden');