diff options
| author | Zach White <skullydazed@gmail.com> | 2021-02-27 12:00:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-27 12:00:50 -0800 |
| commit | 1581ea48dcd48d0d3f42cc09b388c468aedec45d (patch) | |
| tree | 2d028036a4bf80c2e47b952931544f95ba2174e9 /data/schemas/keyboard.jsonschema | |
| parent | 23ed6c4ec0bfb27612da8a7b78d1b484acc23f3f (diff) | |
Fix develop (#12039)
Fixes file encoding errors on Windows, and layouts not correctly merging into info.json.
* force utf8 encoding
* correctly merge layouts and layout aliases
* show what aliases point to
Diffstat (limited to 'data/schemas/keyboard.jsonschema')
| -rw-r--r-- | data/schemas/keyboard.jsonschema | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 967b5f9904..f5fb611bd2 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -85,8 +85,16 @@ "layout_aliases": { "type": "object", "additionalProperties": { - "type": "string", - "pattern": "^LAYOUT_[0-9a-z_]*$" + "oneOf": [ + { + "type": "string", + "enum": ["LAYOUT"] + }, + { + "type": "string", + "pattern": "^LAYOUT_[0-9a-z_]*$" + } + ] } }, "layouts": { |