uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make SwitchLayerAction serialize the correct layer.

Browse Source
This commit is contained in:
László Monda
2016-04-01 22:33:55 +02:00
parent 0ea8fdf5da
commit fb5ac38188
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config-serializer/config-items/SwitchLayerAction.ts
+6 -5
View File
@@ -30,23 +30,24 @@ class SwitchLayerAction extends KeyAction implements Serializable<SwitchLayerAct
fromJsObject(jsObject: any): SwitchLayerAction { fromJsObject(jsObject: any): SwitchLayerAction {
this.assertKeyActionType(jsObject, KeyActionType.SwitchLayerAction, 'SwitchLayerAction'); this.assertKeyActionType(jsObject, KeyActionType.SwitchLayerAction, 'SwitchLayerAction');
this.layer = jsObject.layer; this.layer = Layer[<string>jsObject.layer];
this.isLayerToggleable = jsObject.toggle; this.isLayerToggleable = jsObject.toggle;
return this; return this;
} }
fromBinary(buffer: UhkBuffer): SwitchLayerAction { fromBinary(buffer: UhkBuffer): SwitchLayerAction {
this.readAndAssertKeyActionId(buffer, KeyActionId.SwitchLayerAction, 'SwitchLayerAction'); this.readAndAssertKeyActionId(buffer, KeyActionId.SwitchLayerAction, 'SwitchLayerAction');
this.layer = buffer.readUInt8(); let layer = buffer.readUInt8();
this.isLayerToggleable = (this.layer & SwitchLayerAction.toggleFlag) !== 0; this.isLayerToggleable = (layer & SwitchLayerAction.toggleFlag) !== 0;
this.layer &= ~SwitchLayerAction.toggleFlag; // Clear toggle bit. layer &= ~SwitchLayerAction.toggleFlag; // Clear toggle bit.
this.layer = layer;
return this; return this;
} }
toJsObject(): any { toJsObject(): any {
return { return {
keyActionType: KeyActionType.SwitchLayerAction, keyActionType: KeyActionType.SwitchLayerAction,
layer: this.layer, layer: Layer[this.layer],
toggle: this.isLayerToggleable toggle: this.isLayerToggleable
}; };
} }