Merge pull request #11673 from Snuffleupagus/FontLoader-bind-more-await

Update the `FontLoader.bind` method to avoid explicitly returning `undefined`
This commit is contained in:
Tim van der Meij 2020-03-06 22:51:39 +01:00 committed by GitHub
commit 1bb25f5cb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -71,7 +71,7 @@ class BaseFontLoader {
async bind(font) {
// Add the font to the DOM only once; skip if the font is already loaded.
if (font.attached || font.missingFile) {
return undefined;
return;
}
font.attached = true;
@ -90,7 +90,7 @@ class BaseFontLoader {
throw ex;
}
}
return undefined; // The font was, asynchronously, loaded.
return; // The font was, asynchronously, loaded.
}
// !this.isFontLoadingAPISupported
@ -99,14 +99,14 @@ class BaseFontLoader {
this.insertRule(rule);
if (this.isSyncFontLoadingSupported) {
return undefined; // The font was, synchronously, loaded.
return; // The font was, synchronously, loaded.
}
return new Promise(resolve => {
await new Promise(resolve => {
const request = this._queueLoadingCallback(resolve);
this._prepareFontLoadEvent([rule], [font], request);
});
// The font was, asynchronously, loaded.
}
return undefined;
}
_queueLoadingCallback(callback) {