From c6c4631817247c44f788b1ffa2bc1d9f644802eb Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Wed, 25 Nov 2020 12:39:09 -0500
Subject: Display button improvements (#1065)

* Use hidden and disabled properties instead of custom classes

* Enable transitions on buttons
---
 ext/mixed/js/display.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'ext/mixed/js')

diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 2f24d7bd..807f585a 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -1051,8 +1051,8 @@ class Display extends EventDispatcher {
                 if (Array.isArray(noteIds) && noteIds.length > 0) {
                     noteId = noteIds[0];
                 }
-                button.classList.toggle('disabled', !canAdd);
-                button.classList.remove('pending');
+                button.disabled = !canAdd;
+                button.hidden = false;
             }
             if (noteId !== null) {
                 this._viewerButtonShow(i, noteId);
@@ -1115,14 +1115,14 @@ class Display extends EventDispatcher {
         if (index < 0 || index >= this._definitions.length) { return; }
 
         const button = this._adderButtonFind(index, mode);
-        if (button !== null && !button.classList.contains('disabled')) {
+        if (button !== null && !button.disabled) {
             this._noteAdd(this._definitions[index], mode);
         }
     }
 
     _noteTryView() {
         const button = this._viewerButtonFind(this._index);
-        if (button !== null && !button.classList.contains('disabled')) {
+        if (button !== null && !button.disabled) {
             api.noteView(button.dataset.noteId);
         }
     }
@@ -1136,7 +1136,7 @@ class Display extends EventDispatcher {
                 const index = this._definitions.indexOf(definition);
                 const adderButton = this._adderButtonFind(index, mode);
                 if (adderButton !== null) {
-                    adderButton.classList.add('disabled');
+                    adderButton.disabled = true;
                 }
                 this._viewerButtonShow(index, noteId);
             } else {
@@ -1271,7 +1271,8 @@ class Display extends EventDispatcher {
         if (viewerButton === null) {
             return;
         }
-        viewerButton.classList.remove('pending', 'disabled');
+        viewerButton.disabled = false;
+        viewerButton.hidden = false;
         viewerButton.dataset.noteId = noteId;
     }
 
-- 
cgit v1.2.3