c_meyer/pxt-ev3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename "enter..." to "button enter"

Browse Source
This commit is contained in:
Peli de Halleux 2018-01-11 08:28:25 -08:00
parent c3419c0b74
commit 893dd0f9c4
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/core/_locales/core-strings.json
View File

@ -30,11 +30,11 @@
"brick.Button.pauseUntil|block": "pause until %button|%event", "brick.Button.pauseUntil|block": "pause until %button|%event",
"brick.Button.wasPressed|block": "%button|was pressed", "brick.Button.wasPressed|block": "%button|was pressed",
"brick.batteryLevel|block": "battery level", "brick.batteryLevel|block": "battery level",
"brick.buttonDown|block": "down", "brick.buttonDown|block": "button down",
"brick.buttonEnter|block": "enter", "brick.buttonEnter|block": "button enter",
"brick.buttonLeft|block": "left", "brick.buttonLeft|block": "button left",
"brick.buttonRight|block": "right", "brick.buttonRight|block": "button right",
"brick.buttonUp|block": "up", "brick.buttonUp|block": "button up",
"brick.clearScreen|block": "clear screen", "brick.clearScreen|block": "clear screen",
"brick.lightPattern|block": "%pattern", "brick.lightPattern|block": "%pattern",
"brick.printPorts|block": "print ports", "brick.printPorts|block": "print ports",

11
libs/core/buttons.ts
View File

@ -170,6 +170,7 @@ namespace brick {
// this needs to be done in query(), which is run without the main JS execution mutex // this needs to be done in query(), which is run without the main JS execution mutex
// otherwise, while(true){} will lock the device // otherwise, while(true){} will lock the device
if (ret & DAL.BUTTON_ID_ESCAPE) { if (ret & DAL.BUTTON_ID_ESCAPE) {
motors.stopAllMotors(); // ensuring that all motors are off
control.reset() control.reset()
} }
return ret return ret
@ -203,31 +204,31 @@ namespace brick {
/** /**
* Enter button on the EV3 Brick. * Enter button on the EV3 Brick.
*/ */
//% whenUsed block="enter" weight=95 fixedInstance //% whenUsed block="button enter" weight=95 fixedInstance
export const buttonEnter: Button = new DevButton(DAL.BUTTON_ID_ENTER) export const buttonEnter: Button = new DevButton(DAL.BUTTON_ID_ENTER)
/** /**
* Left button on the EV3 Brick. * Left button on the EV3 Brick.
*/ */
//% whenUsed block="left" weight=95 fixedInstance //% whenUsed block="button left" weight=95 fixedInstance
export const buttonLeft: Button = new DevButton(DAL.BUTTON_ID_LEFT) export const buttonLeft: Button = new DevButton(DAL.BUTTON_ID_LEFT)
/** /**
* Right button on the EV3 Brick. * Right button on the EV3 Brick.
*/ */
//% whenUsed block="right" weight=94 fixedInstance //% whenUsed block="button right" weight=94 fixedInstance
export const buttonRight: Button = new DevButton(DAL.BUTTON_ID_RIGHT) export const buttonRight: Button = new DevButton(DAL.BUTTON_ID_RIGHT)
/** /**
* Up button on the EV3 Brick. * Up button on the EV3 Brick.
*/ */
//% whenUsed block="up" weight=95 fixedInstance //% whenUsed block="button up" weight=95 fixedInstance
export const buttonUp: Button = new DevButton(DAL.BUTTON_ID_UP) export const buttonUp: Button = new DevButton(DAL.BUTTON_ID_UP)
/** /**
* Down button on the EV3 Brick. * Down button on the EV3 Brick.
*/ */
//% whenUsed block="down" weight=95 fixedInstance //% whenUsed block="button down" weight=95 fixedInstance
export const buttonDown: Button = new DevButton(DAL.BUTTON_ID_DOWN) export const buttonDown: Button = new DevButton(DAL.BUTTON_ID_DOWN)
} }