From 8bb515dbd97a5accc76dd21dc97ec2b04cb478fb Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <anders@zulipchat.com>
Date: Wed, 5 Feb 2020 17:16:33 -0800
Subject: [PATCH] emoji: Iterate over emoji_codes data with
 Object.{entries,values}.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
---
 frontend_tests/node_tests/emoji.js |  4 ++--
 static/js/emoji.js                 | 13 ++++++-------
 static/js/emoji_picker.js          |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/frontend_tests/node_tests/emoji.js b/frontend_tests/node_tests/emoji.js
index 68aa5cdeb2..c4f31d7b8c 100644
--- a/frontend_tests/node_tests/emoji.js
+++ b/frontend_tests/node_tests/emoji.js
@@ -115,7 +115,7 @@ run_test('translate_emoticons_to_names', () => {
         {name: 'between symbols', original: 'Hello.<original>! World.', expected: 'Hello.<original>! World.'},
         {name: 'before end of sentence', original: 'Hello <original>!', expected: 'Hello <converted>!'},
     ];
-    _.each(emoji_codes.emoticon_conversions, (full_name, shortcut) => {
+    for (const [shortcut, full_name] of Object.entries(emoji_codes.emoticon_conversions)) {
         _.each(testcases, (t) => {
             const converted_value = full_name;
             let original = t.original;
@@ -126,5 +126,5 @@ run_test('translate_emoticons_to_names', () => {
             const result = emoji.translate_emoticons_to_names(original);
             assert.equal(result, expected);
         });
-    });
+    }
 });
diff --git a/static/js/emoji.js b/static/js/emoji.js
index d8ec12f412..5f0806457a 100644
--- a/static/js/emoji.js
+++ b/static/js/emoji.js
@@ -77,9 +77,8 @@ exports.initialize = function initialize() {
 
 exports.build_emoji_data = function (realm_emojis) {
     exports.emojis_by_name.clear();
-    let emoji_dict;
     for (const [realm_emoji_name, realm_emoji] of realm_emojis) {
-        emoji_dict = {
+        const emoji_dict = {
             name: realm_emoji_name,
             display_name: realm_emoji_name,
             aliases: [realm_emoji_name],
@@ -90,12 +89,12 @@ exports.build_emoji_data = function (realm_emojis) {
         exports.emojis_by_name.set(realm_emoji_name, emoji_dict);
     }
 
-    _.each(emoji_codes.emoji_catalog, function (codepoints) {
-        _.each(codepoints, function (codepoint) {
+    for (const codepoints of Object.values(emoji_codes.emoji_catalog)) {
+        for (const codepoint of codepoints) {
             if (emoji_codes.codepoint_to_name.hasOwnProperty(codepoint)) {
                 const emoji_name = emoji_codes.codepoint_to_name[codepoint];
                 if (!exports.emojis_by_name.has(emoji_name)) {
-                    emoji_dict = {
+                    const emoji_dict = {
                         name: emoji_name,
                         display_name: emoji_name,
                         aliases: exports.default_emoji_aliases.get(codepoint),
@@ -106,8 +105,8 @@ exports.build_emoji_data = function (realm_emojis) {
                     exports.emojis_by_name.set(emoji_name, emoji_dict);
                 }
             }
-        });
-    });
+        }
+    }
 };
 
 exports.build_emoji_upload_widget = function () {
diff --git a/static/js/emoji_picker.js b/static/js/emoji_picker.js
index 2e28183ddc..e06f0c87e3 100644
--- a/static/js/emoji_picker.js
+++ b/static/js/emoji_picker.js
@@ -106,7 +106,7 @@ exports.generate_emoji_picker_data = function (realm_emojis) {
         exports.complete_emoji_catalog.Custom.push(emoji.emojis_by_name.get(realm_emoji_name));
     }
 
-    _.each(emoji_codes.emoji_catalog, function (codepoints, category) {
+    for (const [category, codepoints] of Object.entries(emoji_codes.emoji_catalog)) {
         exports.complete_emoji_catalog[category] = [];
         _.each(codepoints, function (codepoint) {
             if (emoji_codes.codepoint_to_name.hasOwnProperty(codepoint)) {
@@ -118,7 +118,7 @@ exports.generate_emoji_picker_data = function (realm_emojis) {
                 }
             }
         });
-    });
+    }
 
     exports.complete_emoji_catalog.Popular = [];
     _.each(typeahead.popular_emojis, function (codepoint) {