Skip to content
Merged
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
43 changes: 22 additions & 21 deletions pxtblocks/fields/field_note.ts
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ export class FieldNote extends Blockly.FieldNumber implements FieldCustom {
);
pianoDiv.appendChild(this.noteLabel);
this.noteLabel.textContent = "-";
this.noteLabel.ariaLive = "polite";

let startingPage = 0;
for (let i = 0; i < this.nKeys_; i++) {
Expand Down Expand Up @@ -336,7 +337,7 @@ export class FieldNote extends Blockly.FieldNumber implements FieldCustom {
Blockly.DropDownDiv.setColour(this.primaryColour, this.borderColour);
Blockly.DropDownDiv.showPositionedByBlock(this, this.sourceBlock_ as Blockly.BlockSvg, () => this.onHide(), undefined, false);


this.htmlInput_.ariaLabel = lf("Press the up and down arrow keys to select the next or previous note, or enter a value in hertz");
this.htmlInput_.addEventListener("keydown", this.keyHandler);
}

Expand Down Expand Up @@ -641,55 +642,55 @@ export class FieldNote extends Blockly.FieldNumber implements FieldCustom {
if (!FieldNote.Notes) {
FieldNote.Notes = {
28: { name: lf("{id:note}C"), prefixedName: lf("Low C"), freq: 131 },
29: { name: lf("C#"), prefixedName: lf("Low C#"), freq: 139 },
29: { name: lf("C"), prefixedName: lf("Low C"), freq: 139 },
30: { name: lf("{id:note}D"), prefixedName: lf("Low D"), freq: 147 },
31: { name: lf("D#"), prefixedName: lf("Low D#"), freq: 156 },
31: { name: lf("D"), prefixedName: lf("Low D"), freq: 156 },
32: { name: lf("{id:note}E"), prefixedName: lf("Low E"), freq: 165 },
33: { name: lf("{id:note}F"), prefixedName: lf("Low F"), freq: 175 },
34: { name: lf("F#"), prefixedName: lf("Low F#"), freq: 185 },
34: { name: lf("F"), prefixedName: lf("Low F"), freq: 185 },
35: { name: lf("{id:note}G"), prefixedName: lf("Low G"), freq: 196 },
36: { name: lf("G#"), prefixedName: lf("Low G#"), freq: 208 },
36: { name: lf("G"), prefixedName: lf("Low G"), freq: 208 },
37: { name: lf("{id:note}A"), prefixedName: lf("Low A"), freq: 220 },
38: { name: lf("A#"), prefixedName: lf("Low A#"), freq: 233 },
38: { name: lf("A"), prefixedName: lf("Low A"), freq: 233 },
39: { name: lf("{id:note}B"), prefixedName: lf("Low B"), freq: 247 },

40: { name: lf("{id:note}C"), prefixedName: lf("Middle C"), freq: 262 },
41: { name: lf("C#"), prefixedName: lf("Middle C#"), freq: 277 },
41: { name: lf("C"), prefixedName: lf("Middle C"), freq: 277 },
42: { name: lf("{id:note}D"), prefixedName: lf("Middle D"), freq: 294 },
43: { name: lf("D#"), prefixedName: lf("Middle D#"), freq: 311 },
43: { name: lf("D"), prefixedName: lf("Middle D"), freq: 311 },
44: { name: lf("{id:note}E"), prefixedName: lf("Middle E"), freq: 330 },
45: { name: lf("{id:note}F"), prefixedName: lf("Middle F"), freq: 349 },
46: { name: lf("F#"), prefixedName: lf("Middle F#"), freq: 370 },
46: { name: lf("F"), prefixedName: lf("Middle F"), freq: 370 },
47: { name: lf("{id:note}G"), prefixedName: lf("Middle G"), freq: 392 },
48: { name: lf("G#"), prefixedName: lf("Middle G#"), freq: 415 },
48: { name: lf("G"), prefixedName: lf("Middle G"), freq: 415 },
49: { name: lf("{id:note}A"), prefixedName: lf("Middle A"), freq: 440 },
50: { name: lf("A#"), prefixedName: lf("Middle A#"), freq: 466 },
50: { name: lf("A"), prefixedName: lf("Middle A"), freq: 466 },
51: { name: lf("{id:note}B"), prefixedName: lf("Middle B"), freq: 494 },

52: { name: lf("{id:note}C"), prefixedName: lf("Tenor C"), altPrefixedName: lf("High C"), freq: 523 },
53: { name: lf("C#"), prefixedName: lf("Tenor C#"), altPrefixedName: lf("High C#"), freq: 554 },
53: { name: lf("C"), prefixedName: lf("Tenor C"), altPrefixedName: lf("High C"), freq: 554 },
54: { name: lf("{id:note}D"), prefixedName: lf("Tenor D"), altPrefixedName: lf("High D"), freq: 587 },
55: { name: lf("D#"), prefixedName: lf("Tenor D#"), altPrefixedName: lf("High D#"), freq: 622 },
55: { name: lf("D"), prefixedName: lf("Tenor D"), altPrefixedName: lf("High D"), freq: 622 },
56: { name: lf("{id:note}E"), prefixedName: lf("Tenor E"), altPrefixedName: lf("High E"), freq: 659 },
57: { name: lf("{id:note}F"), prefixedName: lf("Tenor F"), altPrefixedName: lf("High F"), freq: 698 },
58: { name: lf("F#"), prefixedName: lf("Tenor F#"), altPrefixedName: lf("High F#"), freq: 740 },
58: { name: lf("F"), prefixedName: lf("Tenor F"), altPrefixedName: lf("High F"), freq: 740 },
59: { name: lf("{id:note}G"), prefixedName: lf("Tenor G"), altPrefixedName: lf("High G"), freq: 784 },
60: { name: lf("G#"), prefixedName: lf("Tenor G#"), altPrefixedName: lf("High G#"), freq: 831 },
60: { name: lf("G"), prefixedName: lf("Tenor G"), altPrefixedName: lf("High G"), freq: 831 },
61: { name: lf("{id:note}A"), prefixedName: lf("Tenor A"), altPrefixedName: lf("High A"), freq: 880 },
62: { name: lf("A#"), prefixedName: lf("Tenor A#"), altPrefixedName: lf("High A#"), freq: 932 },
62: { name: lf("A"), prefixedName: lf("Tenor A"), altPrefixedName: lf("High A"), freq: 932 },
63: { name: lf("{id:note}B"), prefixedName: lf("Tenor B"), altPrefixedName: lf("High B"), freq: 988 },

64: { name: lf("{id:note}C"), prefixedName: lf("High C"), freq: 1046 },
65: { name: lf("C#"), prefixedName: lf("High C#"), freq: 1109 },
65: { name: lf("C"), prefixedName: lf("High C"), freq: 1109 },
66: { name: lf("{id:note}D"), prefixedName: lf("High D"), freq: 1175 },
67: { name: lf("D#"), prefixedName: lf("High D#"), freq: 1245 },
67: { name: lf("D"), prefixedName: lf("High D"), freq: 1245 },
68: { name: lf("{id:note}E"), prefixedName: lf("High E"), freq: 1319 },
69: { name: lf("{id:note}F"), prefixedName: lf("High F"), freq: 1397 },
70: { name: lf("F#"), prefixedName: lf("High F#"), freq: 1478 },
70: { name: lf("F"), prefixedName: lf("High F"), freq: 1478 },
71: { name: lf("{id:note}G"), prefixedName: lf("High G"), freq: 1568 },
72: { name: lf("G#"), prefixedName: lf("High G#"), freq: 1661 },
72: { name: lf("G"), prefixedName: lf("High G"), freq: 1661 },
73: { name: lf("{id:note}A"), prefixedName: lf("High A"), freq: 1760 },
74: { name: lf("A#"), prefixedName: lf("High A#"), freq: 1865 },
74: { name: lf("A"), prefixedName: lf("High A"), freq: 1865 },
75: { name: lf("{id:note}B"), prefixedName: lf("High B"), freq: 1976 }
}
}
Expand Down
Loading