Merge branch 'decompilefieldeditors'

This commit is contained in:
Sam El-Husseini 2017-04-28 14:36:37 -07:00
commit 83f9b0b458
2 changed files with 8 additions and 8 deletions

View File

@ -177,9 +177,9 @@ namespace basic {
//% block="show icon %i" icon="\uf00a"
//% parts="ledmatrix"
//% help=basic/show-icon
//% blockFieldEditor="FieldGridPicker"
//% blockFieldEditorParams.width=400 blockFieldEditorParams.columns=5
//% blockFieldEditorParams.itemColour=black blockFieldEditorParams.tooltips=true
//% i.fieldEditor="gridpicker"
//% i.fieldOptions.width="400" i.fieldOptions.columns="5"
//% i.fieldOptions.itemColour="black" i.fieldOptions.tooltips="true"
export function showIcon(icon: IconNames) {
let res = images.iconImage(icon)
res.showImage(0)

View File

@ -215,7 +215,7 @@ namespace music {
//% weight=50 help=music/note-frequency
//% blockId=device_note block="%note"
//% shim=TD_ID
//% blockFieldEditor="note_editor"
//% note.fieldEditor="note" note.defl="262"
//% useEnumVal=1
export function noteFrequency(name: Note): number {
return name;