Skip to content

Commit

Permalink
Merge pull request #11673 from Snuffleupagus/FontLoader-bind-more-await
Browse files Browse the repository at this point in the history
Update the `FontLoader.bind` method to avoid explicitly returning `undefined`
  • Loading branch information
timvandermeij authored Mar 6, 2020
2 parents 5d566b9 + 7d4be08 commit 1bb25f5
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/display/font_loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -90,7 +90,7 @@ class BaseFontLoader {
throw ex;
}
}
return undefined; // The font was, asynchronously, loaded.
return; // The font was, asynchronously, loaded.
}

// !this.isFontLoadingAPISupported
Expand All @@ -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) {
Expand Down

0 comments on commit 1bb25f5

Please sign in to comment.