diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-03-02 16:24:01 -0600 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-03-06 12:54:46 -0600 |
| commit | a8140d5c01de1f0558a9fc53d90d38c5a1188f80 (patch) | |
| tree | f9151cb7290ba9291ea3f3aa2285f70658efa457 /app/assets/javascripts/behaviors/gl_emoji.js | |
| parent | e6fc0207cb37666cdf606c03641f2afbb5646213 (diff) | |
| download | gitlab-ce-a8140d5c01de1f0558a9fc53d90d38c5a1188f80.tar.gz | |
Fix up `watch` alias lookup in Firefox
It was pulling
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/watch
Diffstat (limited to 'app/assets/javascripts/behaviors/gl_emoji.js')
| -rw-r--r-- | app/assets/javascripts/behaviors/gl_emoji.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/behaviors/gl_emoji.js b/app/assets/javascripts/behaviors/gl_emoji.js index 5d1efdfd51a..34e0544afeb 100644 --- a/app/assets/javascripts/behaviors/gl_emoji.js +++ b/app/assets/javascripts/behaviors/gl_emoji.js @@ -16,7 +16,8 @@ const glEmojiTagDefaults = { }; function glEmojiTag(inputName, options) { const opts = Object.assign({}, glEmojiTagDefaults, options); - const name = emojiAliases[inputName] || inputName; + const name = Object.prototype.hasOwnProperty.call(emojiAliases, inputName) ? + emojiAliases[inputName] : inputName; const emojiInfo = emojiMap[name]; const fallbackImageSrc = `${gon.relative_url_root || ''}/assets/emoji/${name}-${emojiInfo.digest}.png`; const fallbackSpriteClass = `emoji-${name}`; |