From b5d7ccc5433e163a4033cb6ad361ba78299f580a Mon Sep 17 00:00:00 2001 From: jahorton Date: Fri, 13 Mar 2020 13:50:17 +0700 Subject: [PATCH 1/3] fix(web): fixes internal reference for validation tool --- web/bulk_rendering/renderer_core.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/web/bulk_rendering/renderer_core.ts b/web/bulk_rendering/renderer_core.ts index 031f10e3cc..0c7046f5f9 100644 --- a/web/bulk_rendering/renderer_core.ts +++ b/web/bulk_rendering/renderer_core.ts @@ -116,10 +116,14 @@ namespace com.keyman.renderer { let renderLayer = function(i: number) { return new Promise(function(resolve) { // (Private API) Directly sets the keyboard layer within KMW, then uses .show to force-display it. - if(isMobile) { - keyman.osk.layerId = layers[i].id; + if(keyman.osk.vkbd) { + if(isMobile) { + keyman.osk.vkbd.layerId = layers[i].id; + } else { + keyman.osk.vkbd.layerId = Object.keys(layers)[i]; + } } else { - keyman.osk.layerId = Object.keys(layers)[i]; + console.error("Error - keyman.osk.vkbd is undefined!"); } // Make sure the active element's still set! renderer.setActiveDummy(); From d121bf99b9a1da516b0336af59b316995ff72a45 Mon Sep 17 00:00:00 2001 From: jahorton Date: Fri, 13 Mar 2020 15:05:55 +0700 Subject: [PATCH 2/3] fix(web): fixes mobile form for bulk-renderer tool --- web/bulk_rendering/renderer_core.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/bulk_rendering/renderer_core.ts b/web/bulk_rendering/renderer_core.ts index 0c7046f5f9..814a2ca928 100644 --- a/web/bulk_rendering/renderer_core.ts +++ b/web/bulk_rendering/renderer_core.ts @@ -106,7 +106,7 @@ namespace com.keyman.renderer { // Uses 'private' APIs that may be subject to change in the future. Keep it updated! var layers; if(isMobile) { - layers = keyman.osk.layers; + layers = keyman.osk.vkbd.layers; } else { // The desktop OSK will be overpopulated, with a number of blank layers to display in most cases. // We instead rely upon the KLS definition to ensure we keep the renders sparse. @@ -132,7 +132,7 @@ namespace com.keyman.renderer { renderer.render(box, isMobile).then(function(imgEle: HTMLImageElement) { let eleLayer = document.createElement('div'); let eleLayerId = document.createElement('p'); - eleLayerId.textContent = 'Layer ID: ' + (isMobile ? keyman.osk.layers[i].id : Object.keys(layers)[i]); + eleLayerId.textContent = 'Layer ID: ' + (isMobile ? layers[i].id : Object.keys(layers)[i]); eleLayer.appendChild(eleLayerId); eleLayer.appendChild(imgEle); @@ -145,7 +145,7 @@ namespace com.keyman.renderer { }; // The resulting Promise will only call it's `.then()` once all of this keyboard's renders have been completed. - return renderer.arrayPromiseIteration(renderLayer, isMobile ? keyman.osk.layers.length : Object.keys(layers).length); + return renderer.arrayPromiseIteration(renderLayer, isMobile ? layers.length : Object.keys(layers).length); }).catch(function() { console.log("Failed to load the \"" + kbd['InternalName'] + "\" keyboard for rendering!"); divSummary.appendChild(renderer.createKeyboardHeader(kbd, false)); From 0c3f8292f40323a92b4f88fdf5f8c797ee52b1f2 Mon Sep 17 00:00:00 2001 From: jahorton Date: Fri, 13 Mar 2020 15:38:41 +0700 Subject: [PATCH 3/3] chore(web): history.md --- web/history.md | 1 + 1 file changed, 1 insertion(+) diff --git a/web/history.md b/web/history.md index 7e45feb80f..1aabe9b1a8 100644 --- a/web/history.md +++ b/web/history.md @@ -4,6 +4,7 @@ * Bug fix: further updates BuildVisualKeyboard (#2823) * Bug fix: fixes word lookup for wordlist models for languages in the SMP Unicode planes (#2821) * Bug fix: fixes issue with touch-layout popup key modifier interpretation (#2820) +* Bug fix: fixes issue with bulk-rendering OSK validation dev tool (#2823) ## 2020-03-11 13.0.103 stable * Bug fix: updates BuildVisualKeyboard for generating help documentation (#2807)