From 2accc46d8f11a362e2c729f0899c6c47050f379c Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Sun, 27 Mar 2022 20:35:24 -0700 Subject: [PATCH] refactor: refactor --- src/routes/_static/fonts.js | 3 --- src/routes/_store/observers/countryFlagEmojiPolyfill.js | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/routes/_static/fonts.js b/src/routes/_static/fonts.js index 25849152..cd59d72d 100644 --- a/src/routes/_static/fonts.js +++ b/src/routes/_static/fonts.js @@ -1,6 +1,3 @@ // same as the one used for PinaforeEmoji export const FONT_FAMILY = '"Twemoji Mozilla","Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol",' + '"Noto Color Emoji","EmojiOne Color","Android Emoji",sans-serif' - -export const COUNTRY_FLAG_FONT_FAMILY = 'Twemoji Mozilla' -export const COUNTRY_FLAG_FONT_URL = '/TwemojiCountryFlags.woff2' diff --git a/src/routes/_store/observers/countryFlagEmojiPolyfill.js b/src/routes/_store/observers/countryFlagEmojiPolyfill.js index 5fecb0fb..fe0075db 100644 --- a/src/routes/_store/observers/countryFlagEmojiPolyfill.js +++ b/src/routes/_store/observers/countryFlagEmojiPolyfill.js @@ -1,14 +1,15 @@ import { polyfillCountryFlagEmojis } from 'country-flag-emoji-polyfill' import { store } from '../store.js' -import { COUNTRY_FLAG_FONT_FAMILY, COUNTRY_FLAG_FONT_URL } from '../../_static/fonts.js' let polyfilled = false +const COUNTRY_FLAG_FONT_URL = '/TwemojiCountryFlags.woff2' + export function countryFlagEmojiPolyfill () { if (!polyfilled) { polyfilled = true const numStylesBefore = document.head.querySelectorAll('style').length - polyfillCountryFlagEmojis(COUNTRY_FLAG_FONT_FAMILY, COUNTRY_FLAG_FONT_URL) + polyfillCountryFlagEmojis('Twemoji Mozilla', COUNTRY_FLAG_FONT_URL) const numStylesAfter = document.head.querySelectorAll('style').length // if a style was added, then the polyfill was activated const polyfillActivated = numStylesAfter !== numStylesBefore