Commit 2a419cd0 authored by Lukas Eipert's avatar Lukas Eipert Committed by Tim Zallmann

Simplify gl_emoji web component

Remove the unneeded `enforceUnicodeRedering` property and move some
booleans around.
parent 2c3da9b3
...@@ -8,7 +8,7 @@ class GlEmoji extends HTMLElement { ...@@ -8,7 +8,7 @@ class GlEmoji extends HTMLElement {
this.initialize(); this.initialize();
} }
initialize(enforceUnicodeRedering) { initialize() {
let emojiUnicode = this.textContent.trim(); let emojiUnicode = this.textContent.trim();
const { fallbackSpriteClass, fallbackSrc } = this.dataset; const { fallbackSpriteClass, fallbackSrc } = this.dataset;
let { name, unicodeVersion } = this.dataset; let { name, unicodeVersion } = this.dataset;
...@@ -36,16 +36,17 @@ class GlEmoji extends HTMLElement { ...@@ -36,16 +36,17 @@ class GlEmoji extends HTMLElement {
const isEmojiUnicode = const isEmojiUnicode =
this.childNodes && this.childNodes &&
Array.prototype.every.call(this.childNodes, childNode => childNode.nodeType === 3); Array.prototype.every.call(this.childNodes, childNode => childNode.nodeType === 3);
const hasImageFallback = fallbackSrc && fallbackSrc.length > 0;
const hasCssSpriteFalback = fallbackSpriteClass && fallbackSpriteClass.length > 0;
if ( if (
emojiUnicode && emojiUnicode &&
isEmojiUnicode && isEmojiUnicode &&
(!isEmojiUnicodeSupported(emojiUnicode, unicodeVersion) && !enforceUnicodeRedering) !isEmojiUnicodeSupported(emojiUnicode, unicodeVersion)
) { ) {
const hasImageFallback = fallbackSrc && fallbackSrc.length > 0;
const hasCssSpriteFallback = fallbackSpriteClass && fallbackSpriteClass.length > 0;
// CSS sprite fallback takes precedence over image fallback // CSS sprite fallback takes precedence over image fallback
if (hasCssSpriteFalback) { if (hasCssSpriteFallback) {
if (!gon.emoji_sprites_css_added && gon.emoji_sprites_css_path) { if (!gon.emoji_sprites_css_added && gon.emoji_sprites_css_path) {
const emojiSpriteLinkTag = document.createElement('link'); const emojiSpriteLinkTag = document.createElement('link');
emojiSpriteLinkTag.setAttribute('rel', 'stylesheet'); emojiSpriteLinkTag.setAttribute('rel', 'stylesheet');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment