Rename actionType to keyActionType and macroActionType respectively.

This commit is contained in:
László Monda
2016-03-28 17:10:30 +02:00
parent cbf83cf778
commit 81fe488dce
3 changed files with 22 additions and 21 deletions

View File

@@ -4,7 +4,7 @@
class KeyAction {
static fromJsObject(jsObject: any): KeyAction {
switch (jsObject.actionType) {
switch (jsObject.keyActionType) {
case 'none':
let keyActionNone = new KeyActionNone();
keyActionNone.fromJsObject(jsObject);

View File

@@ -32,6 +32,7 @@ class KeystrokeAction extends KeyAction implements Serializable {
toJsObject(): any {
return {
keyActionType: 'keystroke',
scancode: this.scancode,
modifierMask: this.modifierMask
};

View File

@@ -28,33 +28,33 @@
],
"keyActions": [
{
"actionType": "none"
"keyActionType": "none"
},
{
"actionType": "keystroke",
"keyActionType": "keystroke",
"scancode": 120,
"modifierMask": 16
},
{
"actionType": "switchLayer",
"keyActionType": "switchLayer",
"layer": "fn",
"toggle": false
},
{
"actionType": "dualRoleKeystroke",
"keyActionType": "dualRoleKeystroke",
"scancode": 111,
"longPressAction": "mod"
},
{
"actionType": "mouse",
"keyActionType": "mouse",
"mouseAction": "scrollDown"
},
{
"actionType": "playMacro",
"keyActionType": "playMacro",
"macroId": 0
},
{
"actionType": "switchKeymap",
"keyActionType": "switchKeymap",
"keymapId": 1
}
]
@@ -96,57 +96,57 @@
"isLooped": false,
"macroActions": [
{
"actionType": "pressKey",
"macroActionType": "pressKey",
"scancode": 111
},
{
"actionType": "holdKey",
"macroActionType": "holdKey",
"scancode": 111
},
{
"actionType": "releaseKey",
"macroActionType": "releaseKey",
"scancode": 111
},
{
"actionType": "pressModifiers",
"macroActionType": "pressModifiers",
"modifierMask": 111
},
{
"actionType": "holdModifiers",
"macroActionType": "holdModifiers",
"modifierMask": 111
},
{
"actionType": "releaseModifiers",
"macroActionType": "releaseModifiers",
"modifierMask": 111
},
{
"actionType": "pressMouseButtons",
"macroActionType": "pressMouseButtons",
"mouseButtonsMask": 9
},
{
"actionType": "holdMouseButtons",
"macroActionType": "holdMouseButtons",
"mouseButtonsMask": 9
},
{
"actionType": "releaseMouseButtons",
"macroActionType": "releaseMouseButtons",
"mouseButtonsMask": 9
},
{
"actionType": "moveMouse",
"macroActionType": "moveMouse",
"x": 123,
"y": 123
},
{
"actionType": "scrollMouse",
"macroActionType": "scrollMouse",
"x": 123,
"y": 123
},
{
"actionType": "delay",
"macroActionType": "delay",
"delay": "1000"
},
{
"actionType": "text",
"macroActionType": "text",
"text": "this is a text"
}
]