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

renaming all "wait until" to "pause until"

Browse Source
This commit is contained in:
Peli de Halleux
2017-12-12 10:46:56 -08:00
parent e649a167cd
commit bacb4673c9
12 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/touch-sensor/_locales/touch-sensor-jsdoc-strings.json
View File

@ -3,6 +3,6 @@
"sensors.TouchSensor.isPressed": "Check if touch sensor is touched.",
"sensors.TouchSensor.onEvent": "Do something when a touch sensor is touched...",
"sensors.TouchSensor.onEvent|param|body": "code to run when the event is raised",
"sensors.TouchSensor.waitUntil": "Wait until the touch sensor is touched",
"sensors.TouchSensor.pauseUntil": "Wait until the touch sensor is touched",
"sensors.TouchSensor.wasPressed": "Check if touch sensor is touched since it was last checked."
}

2
libs/touch-sensor/_locales/touch-sensor-strings.json
View File

@ -4,7 +4,7 @@
"TouchSensorEvent.Released|block": "released",
"sensors.TouchSensor.isPressed|block": "`icons.touchSensor` %sensor|is pressed",
"sensors.TouchSensor.onEvent|block": "on `icons.touchSensor` %sensor|%event",
"sensors.TouchSensor.waitUntil|block": "wait until `icons.touchSensor` %sensor|%event",
"sensors.TouchSensor.pauseUntil|block": "pause until `icons.touchSensor` %sensor|%event",
"sensors.TouchSensor.wasPressed|block": "`icons.touchSensor` %sensor|was pressed",
"sensors.touchSensor1|block": "1",
"sensors.touchSensor2|block": "2",

6
libs/touch-sensor/touch.ts
View File

@ -59,15 +59,15 @@ namespace sensors {
* @param event the kind of button gesture that needs to be detected
*/
//% help=input/touch-sensor/wait-until
//% blockId=touchWaitUntil block="wait until `icons.touchSensor` %sensor|%event"
//% blockId=touchWaitUntil block="pause until `icons.touchSensor` %sensor|%event"
//% parts="touch"
//% sensor.fieldEditor="imagedropdown"
//% sensor.fieldOptions.columns=4
//% blockNamespace=sensors
//% weight=98 blockGap=8
//% group="Touch Sensor"
waitUntil(ev: TouchSensorEvent) {
this.button.waitUntil(<ButtonEvent><number>ev);
pauseUntil(ev: TouchSensorEvent) {
this.button.pauseUntil(<ButtonEvent><number>ev);
}
/**