erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-25 17:17:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

Merge pull request #4286 from keymanapp/fix/web/4285-single-font-defined

Browse source 
fix(web): better font-wait null guards
This commit is contained in:
Joshua Horton 2021-01-19 09:35:51 +07:00 • committed by GitHub
commit dbcc7dfdee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
web/source/osk/visualKeyboard.ts
View file

@ -2590,14 +2590,14 @@ namespace com.keyman.osk {
let keymanweb = com.keyman.singleton;
let util = keymanweb.util;
if(typeof(kfd) == 'undefined' && typeof(ofd) == 'undefined') {
return true;
}
let fontDefined = !!(kfd && kfd['files']);
kfd = fontDefined ? kfd : undefined;
if(typeof(kfd['files']) == 'undefined' && typeof(ofd['files']) == 'undefined') {
return true;
}
let oskFontDefined = !!(ofd && ofd['files']);
ofd = oskFontDefined ? ofd : undefined;
// Automatically 'ready' if the descriptor is explicitly `undefined`.
// Thus, also covers the case where both are undefined.
var kReady=util.checkFontDescriptor(kfd), oReady=util.checkFontDescriptor(ofd);
if(kReady && oReady) {
return true;