From 53ecad662baddd44554db115d8c0c5161c2cdf96 Mon Sep 17 00:00:00 2001 From: Trent Palmer Date: Wed, 27 May 2020 14:52:32 -0700 Subject: [PATCH] drum-machine fix tooltips for menuselectionitems --- drum-machine/README.md | 1 - drum-machine/drumMachine.css | 1 + drum-machine/makeSelection.js | 10 ++++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drum-machine/README.md b/drum-machine/README.md index f95dbde..9a2fec5 100644 --- a/drum-machine/README.md +++ b/drum-machine/README.md @@ -10,7 +10,6 @@ ### TODOS -* fix toolstips for menuselectionitems * add focus() to selectionMenuItems so that you can immediately begin scrolling with arrow keys * add tip for scrolling selectionMenuItems * make sure metronome continues on volume, sound, or metronome BPM change diff --git a/drum-machine/drumMachine.css b/drum-machine/drumMachine.css index 0d7a3f0..74ed080 100644 --- a/drum-machine/drumMachine.css +++ b/drum-machine/drumMachine.css @@ -170,6 +170,7 @@ body { text-align: center; font-style: bold; font-size: 1.6rem; + direction: ltr; } .selectionMenuItem:active, .volumeSelectionMenuItem:active, .metronomeSelectionMenuItem:active { diff --git a/drum-machine/makeSelection.js b/drum-machine/makeSelection.js index a502300..0f2840a 100644 --- a/drum-machine/makeSelection.js +++ b/drum-machine/makeSelection.js @@ -97,9 +97,13 @@ const showMetronomeSelectionMenuItems = (menuItems) => { const makeMetronomeSelectionMenuItemToolTipContent = (text) => { if (padsArray.includes(text)) { - return sessionStorage.getItem(text + 'isMetronome') === "false" ? 'Metronome Off' : sessionStorage.getItem(text + 'metronomeTempo'); + return 'set metronome tempo for ' + text + ' (or disable)'; + } else if (text === 'Metronome Off') { + return 'turn metronome off for ' + padSelectingFor; } else if (text === '( cancel -- back )') { return text; + } else { + return 'set metronome temp for ' + padSelectingFor + ': ' + text.split(':')[1]; } } @@ -165,9 +169,11 @@ const showVolumeSelectionMenuItems = (menuItems) => { const makeVolumeSelectionMenuItemToolTipContent = (text) => { if (padsArray.includes(text)) { - return 'volume offset for ' + text; + return 'set volume offset for ' + text; } else if (text === '( cancel -- back )') { return text; + } else { + return 'set volume offset for ' + padSelectingFor + ': '+ text; } }