From 4d5f8161e172bc6c9bce30523365ca3ed18e0271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Fri, 1 Apr 2016 22:48:40 +0200 Subject: [PATCH] Fix the serialization of MouseAction.mouseAction --- config-serializer/config-items/MouseAction.ts | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/config-serializer/config-items/MouseAction.ts b/config-serializer/config-items/MouseAction.ts index 7689d410..d10662b4 100644 --- a/config-serializer/config-items/MouseAction.ts +++ b/config-serializer/config-items/MouseAction.ts @@ -17,24 +17,25 @@ enum MouseActionParam { class MouseAction extends KeyAction implements Serializable { private _mouseAction: MouseActionParam; - get mouseAction(): number { + get mouseAction(): MouseActionParam { return this._mouseAction; } set mouseAction(mouseAction) { - if (!this.isMouseActionValid(mouseAction)) { - throw `Invalid MouseAction.mouseAction: ${mouseAction}`; - } +// if (!this.isMouseActionValid(mouseAction)) { +// throw `Invalid MouseAction.mouseAction: ${mouseAction}`; +// } this._mouseAction = mouseAction; } - isMouseActionValid(keyActionParam): boolean { - return MouseActionParam[keyActionParam] !== undefined; - } +// isMouseActionValid(keyActionParam): boolean { +// return MouseActionParam[keyActionParam] !== undefined; +// } fromJsObject(jsObject: any): MouseAction { this.assertKeyActionType(jsObject, KeyActionType.MouseAction, 'MouseAction'); - this.mouseAction = jsObject.mouseAction; + console.log(jsObject.mouseAction) + this.mouseAction = MouseActionParam[jsObject.mouseAction]; return this; } @@ -42,9 +43,9 @@ class MouseAction extends KeyAction implements Serializable { this.readAndAssertKeyActionId(buffer, KeyActionId.MouseAction, 'MouseAction'); this.mouseAction = buffer.readUInt8(); - if (!this.isMouseActionValid(this.mouseAction)) { - throw `Invalid MouseAction.param: ${this.mouseAction}`; - } + // if (!this.isMouseActionValid(this.mouseAction)) { + // throw `Invalid MouseAction.param: ${this.mouseAction}`; + // } return this; }