From 76eaf8cb2df2bed0a72ab14295430d9582039a9d Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Wed, 14 Oct 2015 17:04:17 +1030
Subject: [PATCH] Refactor tag sorting algorithm

closes flarum/core#325
---
 extensions/tags/js/lib/utils/sortTags.js | 38 +++++++++++++++++-------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/extensions/tags/js/lib/utils/sortTags.js b/extensions/tags/js/lib/utils/sortTags.js
index 1a499f1d3..6fa36726e 100644
--- a/extensions/tags/js/lib/utils/sortTags.js
+++ b/extensions/tags/js/lib/utils/sortTags.js
@@ -3,22 +3,38 @@ export default function sortTags(tags) {
     const aPos = a.position();
     const bPos = b.position();
 
+    // If they're both secondary tags, sort them by their discussions count,
+    // descending.
+    if (aPos === null && bPos === null)
+      return b.discussionsCount() - a.discussionsCount();
+
+    // If just one is a secondary tag, then the primary tag should
+    // come first.
+    if (bPos === null) return -1;
+    if (aPos === null) return 1;
+
+    // If we've made it this far, we know they're both primary tags. So we'll
+    // need to see if they have parents.
     const aParent = a.parent();
     const bParent = b.parent();
 
-    if (aPos === null && bPos === null) {
-      return b.discussionsCount() - a.discussionsCount();
-    } else if (bPos === null) {
-      return -1;
-    } else if (aPos === null) {
-      return 1;
-    } else if (aParent === bParent) {
-      return aPos - bPos;
-    } else if (aParent) {
+    // If they both have the same parent, then their positions are local,
+    // so we can compare them directly.
+    if (aParent === bParent) return aPos - bPos;
+
+    // If they are both child tags, then we will compare the positions of their
+    // parents.
+    else if (aParent && bParent)
+      return aParent.position() - bParent.position();
+
+    // If we are comparing a child tag with its parent, then we let the parent
+    // come first. If we are comparing an unrelated parent/child, then we
+    // compare both of the parents.
+    else if (aParent)
       return aParent === b ? 1 : aParent.position() - bPos;
-    } else if (bParent) {
+
+    else if (bParent)
       return bParent === a ? -1 : aPos - bParent.position();
-    }
 
     return 0;
   });