scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 15:02:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #950 from ericrosenbaum/bugfix/import-music-menus

Browse source 
Fix music extension menu import
This commit is contained in:
Eric Rosenbaum 2018-02-28 18:47:30 -05:00 committed by GitHub
commit 981fc57a43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/extensions/scratch3_music/index.js
View file

@ -464,7 +464,7 @@ class Scratch3MusicBlocks {
arguments: { arguments: {
DRUM: { DRUM: {
type: ArgumentType.NUMBER, type: ArgumentType.NUMBER,
menu: 'drums', menu: 'DRUM',
defaultValue: 1 defaultValue: 1
}, },
BEATS: { BEATS: {
@ -506,7 +506,7 @@ class Scratch3MusicBlocks {
arguments: { arguments: {
INSTRUMENT: { INSTRUMENT: {
type: ArgumentType.NUMBER, type: ArgumentType.NUMBER,
menu: 'instruments', menu: 'INSTRUMENT',
defaultValue: 1 defaultValue: 1
} }
} }
@ -540,8 +540,8 @@ class Scratch3MusicBlocks {
} }
], ],
menus: { menus: {
drums: this._buildMenu(this.DRUM_INFO), DRUM: this._buildMenu(this.DRUM_INFO),
instruments: this._buildMenu(this.INSTRUMENT_INFO) INSTRUMENT: this._buildMenu(this.INSTRUMENT_INFO)
} }
}; };
} }

8
src/serialization/sb2.js
View file

@ -533,6 +533,14 @@ const parseBlock = function (sb2block, addBroadcastMsg, getVariableId, extension
if (shadowObscured) { if (shadowObscured) {
fieldValue = ''; fieldValue = '';
} }
} else if (expectedArg.inputOp === 'music.menu.DRUM') {
if (shadowObscured) {
fieldValue = 1;
}
} else if (expectedArg.inputOp === 'music.menu.INSTRUMENT') {
if (shadowObscured) {
fieldValue = 1;
}
} else if (shadowObscured) { } else if (shadowObscured) {
// Filled drop-down menu. // Filled drop-down menu.
fieldValue = ''; fieldValue = '';

4
src/serialization/sb2_specmap.js
View file

@ -424,7 +424,7 @@ const specMap = {
argMap: [ argMap: [
{ {
type: 'input', type: 'input',
inputOp: 'math_number', inputOp: 'music.menu.DRUM',
inputName: 'DRUM' inputName: 'DRUM'
}, },
{ {
@ -464,7 +464,7 @@ const specMap = {
argMap: [ argMap: [
{ {
type: 'input', type: 'input',
inputOp: 'math_number', inputOp: 'music.menu.INSTRUMENT',
inputName: 'INSTRUMENT' inputName: 'INSTRUMENT'
} }
] ]