Fix the serialization of MouseAction.mouseAction

This commit is contained in:
László Monda
2016-04-01 22:48:40 +02:00
parent fb5ac38188
commit 4d5f8161e1
+12 -11
View File
@@ -17,24 +17,25 @@ enum MouseActionParam {
class MouseAction extends KeyAction implements Serializable<MouseAction> { class MouseAction extends KeyAction implements Serializable<MouseAction> {
private _mouseAction: MouseActionParam; private _mouseAction: MouseActionParam;
get mouseAction(): number { get mouseAction(): MouseActionParam {
return this._mouseAction; return this._mouseAction;
} }
set mouseAction(mouseAction) { set mouseAction(mouseAction) {
if (!this.isMouseActionValid(mouseAction)) { // if (!this.isMouseActionValid(mouseAction)) {
throw `Invalid MouseAction.mouseAction: ${mouseAction}`; // throw `Invalid MouseAction.mouseAction: ${mouseAction}`;
} // }
this._mouseAction = mouseAction; this._mouseAction = mouseAction;
} }
isMouseActionValid(keyActionParam): boolean { // isMouseActionValid(keyActionParam): boolean {
return MouseActionParam[keyActionParam] !== undefined; // return MouseActionParam[<string>keyActionParam] !== undefined;
} // }
fromJsObject(jsObject: any): MouseAction { fromJsObject(jsObject: any): MouseAction {
this.assertKeyActionType(jsObject, KeyActionType.MouseAction, 'MouseAction'); this.assertKeyActionType(jsObject, KeyActionType.MouseAction, 'MouseAction');
this.mouseAction = jsObject.mouseAction; console.log(jsObject.mouseAction)
this.mouseAction = MouseActionParam[<string>jsObject.mouseAction];
return this; return this;
} }
@@ -42,9 +43,9 @@ class MouseAction extends KeyAction implements Serializable<MouseAction> {
this.readAndAssertKeyActionId(buffer, KeyActionId.MouseAction, 'MouseAction'); this.readAndAssertKeyActionId(buffer, KeyActionId.MouseAction, 'MouseAction');
this.mouseAction = buffer.readUInt8(); this.mouseAction = buffer.readUInt8();
if (!this.isMouseActionValid(this.mouseAction)) { // if (!this.isMouseActionValid(this.mouseAction)) {
throw `Invalid MouseAction.param: ${this.mouseAction}`; // throw `Invalid MouseAction.param: ${this.mouseAction}`;
} // }
return this; return this;
} }