Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions js/piemenus.js
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,9 @@ const piemenuPitches = (

// Auto-selection of sharps and flats in fixed solfege handles the
// case of opening the pie-menu, not whilst in the pie-menu.
const hasUserValue = block.value && block.value.length > 0 && block.value !== "sol";
if (
!hasUserValue &&
(!block.activity.KeySignatureEnv[2] && block.name === "solfege") ||
(block.name === "notename" &&
(block.connections[0] != undefined
Expand Down Expand Up @@ -550,6 +552,7 @@ const piemenuPitches = (
// for solfege pie-menu In. case of alphabet, direct comparison
// is performed.
if (
!userAlreadySelectedAccidental &&
(!block.activity.KeySignatureEnv[2] && that.name === "solfege") ||
(that.name === "notename" &&
(that.connections[0] != undefined
Expand Down Expand Up @@ -646,8 +649,8 @@ const piemenuPitches = (
that.text.text = selection["note"];
that.value = selection["note"];
} else {
that.value = selection["note"] + selection["attr"];
that.text.text = that.value;

that.text.text = selection["note"] + selection["attr"];
}
// Store the selected accidental in the block for later use.
prevAccidental = selection["attr"];
Expand Down Expand Up @@ -3499,7 +3502,7 @@ const piemenuBlockContext = (block) => {

wheel.navItems[2].navigateFunction = () => {
that.blocks.activeBlock = blockBlock;
that.blocks.extract();

that.blocks.sendStackToTrash(that.blocks.blockList[blockBlock]);
docById("contextWheelDiv").style.display = "none";
// prompting a notification on deleting any block
Expand Down