Fix up `watch` alias lookup in Firefox

It was pulling
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/watch

2 files changed, 3 insertions, 2 deletions

diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index 38732abaa86..d7beb246288 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -444,7 +444,7 @@ AwardsHandler.prototype.scrollToAwards = function scrollToAwards() {
 };
 
 AwardsHandler.prototype.normalizeEmojiName = function normalizeEmojiName(emoji) {
-  return this.aliases[emoji] || emoji;
+  return Object.prototype.hasOwnProperty.call(this.aliases, emoji) ? this.aliases[emoji] : emoji;
 };
 
 AwardsHandler
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}`;