♻️ 🚮 [amp story interactives] [amp story dev tools] Refactor loadFont…

…s_ (#36795) * Refactor loadFonts * lint * add new
ampproject · Nov 5, 2021 · e38c8d9 · e38c8d9
1 parent defb288
commit e38c8d9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 24 deletions.
diff --git a/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools.js b/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools.js
@@ -225,20 +225,14 @@ export class AmpStoryDevTools extends AMP.BaseElement {
     });
   }
 
-  /**
-   * @private
-   */
+  /** @private */
   loadFonts_() {
     if (this.win.document.fonts && FontFace) {
-      fontsToLoad.forEach((fontProperties) => {
-        const font = new FontFace(fontProperties.family, fontProperties.src, {
-          weight: fontProperties.weight,
-          style: 'normal',
-        });
-        font.load().then(() => {
-          this.win.document.fonts.add(font);
-        });
-      });
+      fontsToLoad.forEach(({family, src, style = 'normal', weight}) =>
+        new FontFace(family, src, {weight, style})
+          .load()
+          .then((font) => this.win.document.fonts.add(font))
+      );
     }
   }
 

diff --git a/extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js b/extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js
@@ -284,24 +284,18 @@ export class AmpStoryInteractive extends AMP.BaseElement {
     });
   }
 
-  /**
-   * @private
-   */
+  /** @private */
   loadFonts_() {
     if (
       !AmpStoryInteractive.loadedFonts &&
       this.win.document.fonts &&
       FontFace
     ) {
-      fontsToLoad.forEach((fontProperties) => {
-        const font = new FontFace(fontProperties.family, fontProperties.src, {
-          weight: fontProperties.weight,
-          style: 'normal',
-        });
-        font.load().then(() => {
-          this.win.document.fonts.add(font);
-        });
-      });
+      fontsToLoad.forEach(({family, src, style = 'normal', weight}) =>
+        new FontFace(family, src, {weight, style})
+          .load()
+          .then((font) => this.win.document.fonts.add(font))
+      );
     }
     AmpStoryInteractive.loadedFonts = true;
   }