script: Fix handling of mixed actions (clashing keystrokes)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/templates/script.ts b/templates/script.ts
index fe80192d63174793be6da38fefa36014218e5bc0..48c10157d2154a08bec711cff7f5a2f9d87bab4f 100644 (file)
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -410,8 +410,12 @@ function recompute_keybindings() {
   });
   var uo_keys = Object.keys(uo_map);
   uo_keys.sort(function (ak,bk) {
-    let a = uo_map[ak]!;
-    let b = uo_map[bk]!;
+    let a = uo_map[ak];
+    let b = uo_map[bk];
+    if (a==null || b==null) return (
+      ( (!!a) as any ) -
+      ( (!!b) as any )
+    );
     return uo_kind_prec[a.kind] - uo_kind_prec[b.kind]
       || ak.localeCompare(bk);
   });
@@ -426,7 +430,8 @@ function recompute_keybindings() {
     else celem.remove();
   }
   for (var kk of uo_keys) {
-    let uo = uo_map[kk]!;
+    let uo = uo_map[kk];
+    if (!uo) continue;
     let prec = uo_kind_prec[uo.kind];
     let ent = document.createElement('div');
     ent.innerHTML = '<b>' + kk + '</b> ' + uo.desc;