From d0f72fb05d7dc76d10ffcf13b7fb45384af841fd Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Fri, 19 Jun 2015 18:19:13 +0930
Subject: [PATCH] Fix up sorting of children in the tag selection list

---
 extensions/tags/js/src/components/tag-discussion-modal.js | 1 +
 extensions/tags/js/src/utils/sort-tags.js                 | 4 ++--
 extensions/tags/less/extension.less                       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/extensions/tags/js/src/components/tag-discussion-modal.js b/extensions/tags/js/src/components/tag-discussion-modal.js
index 4a5ecbe64..b3cc4c824 100644
--- a/extensions/tags/js/src/components/tag-discussion-modal.js
+++ b/extensions/tags/js/src/components/tag-discussion-modal.js
@@ -99,6 +99,7 @@ export default class TagDiscussionModal extends FormModal {
               'data-index': tag.id(),
               className: classList({
                 pinned: tag.position() !== null,
+                child: !!tag.parent(),
                 colored: !!tag.color(),
                 selected: selected.indexOf(tag) !== -1,
                 active: this.index() == tag
diff --git a/extensions/tags/js/src/utils/sort-tags.js b/extensions/tags/js/src/utils/sort-tags.js
index 9e3a72750..c46c8e39d 100644
--- a/extensions/tags/js/src/utils/sort-tags.js
+++ b/extensions/tags/js/src/utils/sort-tags.js
@@ -15,9 +15,9 @@ export default function sortTags(tags) {
     } else if (aParent === bParent) {
       return aPos - bPos;
     } else if (aParent) {
-      return aParent.position() - bPos;
+      return aParent === b ? -1 : aParent.position() - bPos;
     } else if (bParent) {
-      return aPos - bParent.position();
+      return bParent === a ? -1 : aPos - bParent.position();
     }
 
     return 0;
diff --git a/extensions/tags/less/extension.less b/extensions/tags/less/extension.less
index e2d4a92c2..85547de7b 100644
--- a/extensions/tags/less/extension.less
+++ b/extensions/tags/less/extension.less
@@ -168,7 +168,7 @@
     cursor: pointer;
     white-space: nowrap;
 
-    &.pinned {
+    &.pinned:not(.child) {
       padding-top: 10px;
       padding-bottom: 10px;