From fd21ecb189de5adf1be275ad6f81b7f59610c3cc Mon Sep 17 00:00:00 2001
From: Julian Schacher <julian@jsts.xyz>
Date: Sun, 16 May 2021 20:17:17 +0200
Subject: [PATCH] Refactor: Move individual top bar box ordering into own
 method

Move the individual top bar box ordering into own method, so that this
method can be used elsewhere in the future to easily order a single box.
---
 src/extension.js | 58 ++++++++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/src/extension.js b/src/extension.js
index 3067cf0..5615d14 100644
--- a/src/extension.js
+++ b/src/extension.js
@@ -12,7 +12,7 @@ class Extension {
 
     enable() {
         this._addNewItemsToBoxOrders();
-        this._orderTopBarItems();
+        this._orderTopBarItemsOfAllBoxes();
         this._overwritePanelAddToPanelBox();
     }
 
@@ -81,31 +81,47 @@ class Extension {
     }
 
     /**
-     * This method orders the top bar items according to the configured box
-     * orders.
+     * This methods orders the top bar items of all boxes according to the
+     * configured box orders using `this._orderTopBarItems`.
      */
-    _orderTopBarItems() {
-        // Get valid box orders.
-        const validLeftBoxOrder = this._createValidBoxOrder("left");
-        const validCenterBoxOrder = this._createValidBoxOrder("center");
-        const validRightBoxOrder = this._createValidBoxOrder("right");
+    _orderTopBarItemsOfAllBoxes() {
+        this._orderTopBarItems("left");
+        this._orderTopBarItems("center");
+        this._orderTopBarItems("right");
+    }
 
-        // Go through the items (or rather their roles) of a box and order the
-        // box accordingly.
-        const orderBox = (boxOrder, box) => {
-            for (let i = 0; i < boxOrder.length; i++) {
-                const role = boxOrder[i];
-                // Get the indicator container associated with the current role.
-                const associatedIndicatorContainer = Main.panel.statusArea[role].container;
+    /**
+     * This method orders the top bar items of the specified box according to
+     * the configured box orders.
+     * @param {string} box - The box to order.
+     */
+    _orderTopBarItems(box) {
+        // Get the valid box order.
+        const validBoxOrder = this._createValidBoxOrder(box);
 
-                box.set_child_at_index(associatedIndicatorContainer, i);
-            }
+        // Get the relevant box of `Main.panel`.
+        let panelBox;
+        switch (box) {
+            case "left":
+                panelBox = Main.panel._leftBox;
+                break;
+            case "center":
+                panelBox = Main.panel._centerBox;
+                break;
+            case "right":
+                panelBox = Main.panel._rightBox;
+                break;
         }
 
-        // Order the top bar items.
-        orderBox(validLeftBoxOrder, Main.panel._leftBox);
-        orderBox(validCenterBoxOrder, Main.panel._centerBox);
-        orderBox(validRightBoxOrder, Main.panel._rightBox);
+        // Go through the items (or rather their roles) of the validBoxOrder and
+        // order the panelBox accordingly.
+        for (let i = 0; i < validBoxOrder.length; i++) {
+            const role = validBoxOrder[i];
+            // Get the indicator container associated with the current role.
+            const associatedIndicatorContainer = Main.panel.statusArea[role].container;
+
+            panelBox.set_child_at_index(associatedIndicatorContainer, i);
+        }
     }
 
     /**