Relax requirement for providing matrix pair for decal keys

the-via · Jan 7, 2020 · c772de4 · c772de4
1 parent 0433627
commit c772de4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -2,7 +2,6 @@
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
-
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./validated-types/keyboard-definition-v2.validator"));
 var via_definition_v2_validator_1 = require("./validated-types/via-definition-v2.validator");

diff --git a/dist/kle-parser.js b/dist/kle-parser.js
@@ -184,7 +184,8 @@ function kleLayoutToVIALayout(kle) {
             else if (typeof n === 'string') {
                 var colorCountKey = c + ":" + t;
                 var labels = n.split('\n');
-                var _d = extractPair(labels[0]), row = _d[0], col = _d[1];
+                // Ignore row,col + requirement if key is a decal key
+                var _d = d ? [0, 0] : extractPair(labels[0]), row = _d[0], col = _d[1];
                 var groupLabel = labels[3] || '-1,0';
                 var _e = extractPair(groupLabel), group = _e[0], option = _e[1];
                 var newColorCount = __assign(__assign({}, colorCount), (_b = {}, _b[colorCountKey] = colorCount[colorCountKey] === undefined

diff --git a/src/kle-parser.ts b/src/kle-parser.ts
@@ -262,7 +262,8 @@ export function kleLayoutToVIALayout(kle: KLELayout): VIALayout {
           } else if (typeof n === 'string') {
             const colorCountKey = `${c}:${t}`;
             const labels = n.split('\n');
-            const [row, col] = extractPair(labels[0]);
+            // Ignore row,col + requirement if key is a decal key
+            const [row, col] = d ? [0, 0] : extractPair(labels[0]);
             const groupLabel = labels[3] || '-1,0';
             const [group, option] = extractPair(groupLabel);
             const newColorCount = {