From e72ff6b81095f3374e8a4b5bc366e56f781cd03b Mon Sep 17 00:00:00 2001
From: DCoded <dicoded@email.com>
Date: Fri, 20 Aug 2021 09:02:23 -0400
Subject: [PATCH] Cleaned up Slave Interact controls
---
src/interaction/siNavigation.js | 31 +++++++++++++++----------------
src/interaction/slaveInteract.js | 2 +-
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/interaction/siNavigation.js b/src/interaction/siNavigation.js
index e6e7bc4b36f..f36762e561f 100644
--- a/src/interaction/siNavigation.js
+++ b/src/interaction/siNavigation.js
@@ -17,25 +17,24 @@ App.UI.SlaveInteract.navigation = function(slave) {
}
const placeInLine = App.UI.SlaveInteract.placeInLine(slave);
+ const controls = App.UI.DOM.appendNewElement("div", p);
+ const previous = App.UI.DOM.makeElement("span", App.UI.DOM.passageLink(" Prev ", "Slave Interact",
+ () => { V.AS = placeInLine[0]; }), ["adjacent-slave"]);
+ const next = App.UI.DOM.makeElement("span", App.UI.DOM.passageLink(" Next ", "Slave Interact",
+ () => { V.AS = placeInLine[1]; }), ["adjacent-slave"]);
- App.UI.DOM.appendNewElement("span", p, App.UI.Hotkeys.hotkeys("prev-slave"), "hotkey");
- const prevSpan = App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Prev", "Slave Interact",
- () => { V.AS = placeInLine[0]; }), "adjacent-slave");
- prevSpan.id = "prev-slave";
- p.append(" ", prevSpan);
+ previous.id = "prev-slave";
+ next.id = "next-slave";
- const centerSpan = document.createElement("span");
- centerSpan.classList.add("interact-name");
+ controls.append(
+ App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("prev-slave"), ['hotkey']),
+ previous,
+ App.UI.DOM.makeElement("span", App.UI.favoriteToggle(slave)),
+ next,
+ App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("next-slave"), ['hotkey']),
+ );
- App.UI.DOM.appendNewElement("span", centerSpan, slave.slaveName, "slave-name");
- centerSpan.append(" ", App.UI.favoriteToggle(slave));
- p.append(centerSpan);
-
- const nextSpan = App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Next", "Slave Interact",
- () => { V.AS = placeInLine[1]; }), "adjacent-slave");
- nextSpan.id = "next-slave";
- p.append(nextSpan, " ");
- App.UI.DOM.appendNewElement("span", p, App.UI.Hotkeys.hotkeys("next-slave"), "hotkey");
+ App.UI.DOM.appendNewElement("h1", p, SlaveFullName(slave), ['slave-name']);
return p;
};
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index 3032cc835a2..3c721c5be41 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -163,7 +163,7 @@ App.UI.SlaveInteract.mainPage = function(slave) {
const el = new DocumentFragment();
App.Events.drawEventArt(el, slave);
for (const tab of tabs) {
- App.UI.DOM.appendNewElement("h1", el, tab.title);
+ App.UI.DOM.appendNewElement("h2", el, tab.title);
el.append(tab.node);
}
return el;
--
GitLab