Button name clashes with C++

This commit is contained in:
Michal Moskal 2017-07-10 12:48:04 +01:00
parent 0cc3cfee4b
commit 0d9e719078
3 changed files with 5 additions and 5 deletions

View File

@ -424,7 +424,7 @@ namespace input.internal {
} }
namespace input { namespace input {
export class Button extends control.Component { export class ButtonTS extends control.Component {
private downTime: number; private downTime: number;
private _isPressed: boolean; private _isPressed: boolean;
private _wasPressed: boolean; private _wasPressed: boolean;

View File

@ -43,14 +43,14 @@ namespace input {
export class IrSensor extends internal.UartSensor { export class IrSensor extends internal.UartSensor {
private channel: IrRemoteChannel private channel: IrRemoteChannel
private pollRunning: boolean private pollRunning: boolean
private buttons: Button[]; private buttons: ButtonTS[];
constructor() { constructor() {
super() super()
this.channel = IrRemoteChannel.Ch0 this.channel = IrRemoteChannel.Ch0
this.buttons = [] this.buttons = []
for (let i = 0; i < 5; ++i) { for (let i = 0; i < 5; ++i) {
this.buttons.push(new Button()) this.buttons.push(new ButtonTS())
} }
} }

View File

@ -1,10 +1,10 @@
namespace input { namespace input {
export class TouchSensor extends internal.AnalogSensor { export class TouchSensor extends internal.AnalogSensor {
button: Button; button: ButtonTS;
constructor() { constructor() {
super() super()
this.button = new Button() this.button = new ButtonTS()
} }
_query() { _query() {