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

Merge pull request #6442 from keymanapp/fix/web/track-load-error-detail

Browse source 
fix(web): track load error detail
This commit is contained in:
Marc Durdin 2022-03-31 06:40:43 +11:00 • committed by GitHub
commit 2434570f88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
web/source/keyboards/kmwkeyboards.ts
View file

@ -484,7 +484,7 @@ namespace com.keyman.keyboards {
//
// In case p's rejection is never caught, throwing this error will generate logs that shows up
// in Sentry or in the console, with useful information for debugging either way.
throw new Error("Unable to load keyboard with internal name \"" + PInternalName + "\", language code \"" + PLgCode + "\": "+JSON.stringify(error));
throw new Error("Unable to load keyboard with internal name \"" + PInternalName + "\", language code \"" + PLgCode + "\": " + error);
});
return p;
@ -700,7 +700,7 @@ namespace com.keyman.keyboards {
* @param {Object} kbdStub keyboard stub to be loaded.
*
**/
installKeyboard(resolve: () => void, reject: () => void, kbdStub: KeyboardStub) {
installKeyboard(resolve: () => void, reject: (message?: string) => void, kbdStub: KeyboardStub) {
var util = this.keymanweb.util;
var osk = this.keymanweb.osk;
@ -717,6 +717,8 @@ namespace com.keyman.keyboards {
var kbdLang = kbdStub['KL'];
var kbdName = kbdStub['KN'];
const scriptSrc = this.keymanweb.getKeyboardPath(kbdFile);
var manager = this;
let core = com.keyman.singleton.core;
@ -729,11 +731,12 @@ namespace com.keyman.keyboards {
}
// We already know the load has failed... why wait?
kbdStub.asyncLoader.callback('Cannot find the ' + kbdName + ' keyboard for ' + kbdLang + '.', 'warn');
const msg = 'Cannot find the ' + kbdName + ' keyboard for ' + kbdLang + ' at ' + scriptSrc + '.';
kbdStub.asyncLoader.callback(msg, 'warn');
kbdStub.asyncLoader = null;
reject();
}, false);
reject(msg);
});
// The load event will activate a newly-loaded keyboard if successful and report an error if it is not.
@ -746,7 +749,7 @@ namespace com.keyman.keyboards {
// To determine if the load was successful, we'll need to check the keyboard array for our desired keyboard.
// Test if keyboard already loaded
var kbd = manager.getKeyboardByID(kbdStub['KI']), Li;
var kbd = manager.getKeyboardByID(kbdStub['KI']);
if(kbd) { // Is cleared upon a successful load.
//Activate keyboard, if it's still the active stub.
@ -780,27 +783,29 @@ namespace com.keyman.keyboards {
resolve();
// A handler portion for cases where the new <script> block loads, but fails to process.
} else { // Output error messages even when embedded - they're useful when debugging the apps and KMEA/KMEI engines.
kbdStub.asyncLoader.callback('Error registering the ' + kbdName + ' keyboard for ' + kbdLang + '.', 'error');
const msg = 'Error registering the ' + kbdName + ' keyboard for ' + kbdLang + '; keyboard script at ' + scriptSrc + ' may contain an error.';
kbdStub.asyncLoader.callback(msg, 'error');
kbdStub.asyncLoader = null;
reject();
reject(msg);
}
}, false);
// IE likes to instantly start loading the file when assigned to an element, so we do this after the rest
// of our setup. This method is not relocated here (yet) b/c it varies based upon 'native' vs 'embedded'.
Lscript.src = this.keymanweb.getKeyboardPath(kbdFile);
Lscript.src = scriptSrc;
try {
document.body.appendChild(Lscript);
this.linkedScripts.push(Lscript);
}
catch(ex) {
try {
document.getElementsByTagName('head')[0].appendChild(Lscript);
} catch(ex2) {
reject();
reject('Error registering script ' + scriptSrc + ': ' + ex2);
return;
}
}
this.linkedScripts.push(Lscript);
}
/* TODO: why not use util.loadCookie and saveCookie?? */