From 0b554c936a21469eebd270bb7c917a3529188f6a Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Fri, 30 Apr 2021 18:15:32 -0400
Subject: [PATCH] Add support for reordering dictionary options (#1641)

---
 .../pages/settings/dictionary-controller.js   | 47 +++++++++++++++++++
 ext/settings.html                             |  2 +
 ext/welcome.html                              |  2 +
 3 files changed, 51 insertions(+)

diff --git a/ext/js/pages/settings/dictionary-controller.js b/ext/js/pages/settings/dictionary-controller.js
index 6d358f25..dcbe0988 100644
--- a/ext/js/pages/settings/dictionary-controller.js
+++ b/ext/js/pages/settings/dictionary-controller.js
@@ -51,6 +51,7 @@ class DictionaryEntry {
         this._priorityInput.dataset.setting = `dictionaries[${index}].priority`;
         this._enabledCheckbox.dataset.setting = `dictionaries[${index}].enabled`;
         this._eventListeners.addEventListener(this._enabledCheckbox, 'settingChanged', this._onEnabledChanged.bind(this), false);
+        this._eventListeners.addEventListener(this._menuButton, 'menuOpen', this._onMenuOpen.bind(this), false);
         this._eventListeners.addEventListener(this._menuButton, 'menuClose', this._onMenuClose.bind(this), false);
         this._eventListeners.addEventListener(this._outdatedButton, 'click', this._onOutdatedButtonClick.bind(this), false);
         this._eventListeners.addEventListener(this._integrityButton, 'click', this._onIntegrityButtonClick.bind(this), false);
@@ -77,6 +78,13 @@ class DictionaryEntry {
 
     // Private
 
+    _onMenuOpen(e) {
+        const bodyNode = e.detail.menu.bodyNode;
+        const count = this._dictionaryController.dictionaryOptionCount;
+        this._setMenuActionEnabled(bodyNode, 'moveUp', this._index > 0);
+        this._setMenuActionEnabled(bodyNode, 'moveDown', this._index < count - 1);
+    }
+
     _onMenuClose(e) {
         switch (e.detail.action) {
             case 'delete':
@@ -85,6 +93,12 @@ class DictionaryEntry {
             case 'showDetails':
                 this._showDetails();
                 break;
+            case 'moveUp':
+                this._move(-1);
+                break;
+            case 'moveDown':
+                this._move(1);
+                break;
         }
     }
 
@@ -148,6 +162,16 @@ class DictionaryEntry {
     _delete() {
         this._dictionaryController.deleteDictionary(this.dictionaryTitle);
     }
+
+    _move(offset) {
+        this._dictionaryController.swapDictionaryOptions(this._index, this._index + offset);
+    }
+
+    _setMenuActionEnabled(menu, action, enabled) {
+        const element = menu.querySelector(`[data-menu-action="${action}"]`);
+        if (element === null) { return; }
+        element.disabled = !enabled;
+    }
 }
 
 class DictionaryExtraInfo {
@@ -226,6 +250,10 @@ class DictionaryController {
         return this._modalController;
     }
 
+    get dictionaryOptionCount() {
+        return this._dictionaryEntries.length;
+    }
+
     async prepare() {
         this._checkIntegrityButton = document.querySelector('#dictionary-check-integrity');
         this._dictionaryEntryContainer = document.querySelector('#dictionary-list');
@@ -257,6 +285,25 @@ class DictionaryController {
         modal.setVisible(true);
     }
 
+    async swapDictionaryOptions(index1, index2) {
+        const options = await this._settingsController.getOptions();
+        const {dictionaries} = options;
+        if (
+            index1 < 0 || index1 >= dictionaries.length ||
+            index2 < 0 || index2 >= dictionaries.length
+        ) {
+            return;
+        }
+
+        await this._settingsController.modifyProfileSettings([{
+            action: 'swap',
+            path1: `dictionaries[${index1}]`,
+            path2: `dictionaries[${index2}]`
+        }]);
+
+        await this._updateEntries();
+    }
+
     instantiateTemplate(name) {
         return this._settingsController.instantiateTemplate(name);
     }
diff --git a/ext/settings.html b/ext/settings.html
index eee06a60..6f0c67ad 100644
--- a/ext/settings.html
+++ b/ext/settings.html
@@ -2266,6 +2266,8 @@
 
 <template id="dictionary-menu-template"><div class="popup-menu-container" tabindex="-1" role="dialog"><div class="popup-menu"><div class="popup-menu-body">
     <button class="popup-menu-item" data-menu-action="showDetails">Details&hellip;</button>
+    <button class="popup-menu-item" data-menu-action="moveUp">Move up</button>
+    <button class="popup-menu-item" data-menu-action="moveDown">Move down</button>
     <button class="popup-menu-item" data-menu-action="delete">Delete</button>
 </div></div></div></template>
 
diff --git a/ext/welcome.html b/ext/welcome.html
index fc7c203f..5561dee7 100644
--- a/ext/welcome.html
+++ b/ext/welcome.html
@@ -358,6 +358,8 @@
 
 <template id="dictionary-menu-template"><div class="popup-menu-container" tabindex="-1" role="dialog"><div class="popup-menu"><div class="popup-menu-body">
     <button class="popup-menu-item" data-menu-action="showDetails">Details&hellip;</button>
+    <button class="popup-menu-item" data-menu-action="moveUp">Move up</button>
+    <button class="popup-menu-item" data-menu-action="moveDown">Move down</button>
     <button class="popup-menu-item" data-menu-action="delete">Delete</button>
 </div></div></div></template>