Refactor all emoji utility methods into window.Signal.Emoji

background.html

@@ -934,7 +934,6 @@ <h3>{{ message }}</h3>
   <script type='text/javascript' src='js/registration.js'></script>
   <script type='text/javascript' src='js/expire.js'></script>
   <script type='text/javascript' src='js/conversation_controller.js'></script>
-  <script type='text/javascript' src='js/emoji_util.js'></script>
 
   <script type='text/javascript' src='js/views/react_wrapper_view.js'></script>
   <script type='text/javascript' src='js/views/whisper_view.js'></script>

js/signal.js

@@ -3,6 +3,7 @@
 const Backbone = require('../ts/backbone');
 const Crypto = require('./modules/crypto');
 const Database = require('./modules/database');
+const Emoji = require('../ts/util/emoji');
 const HTML = require('../ts/html');
 const Message = require('./modules/types/message');
 const Notifications = require('../ts/notifications');
@@ -117,6 +118,7 @@ exports.setup = (options = {}) => {
     Components,
     Crypto,
     Database,
+    Emoji,
     HTML,
     Migrations,
     Notifications,

js/views/conversation_list_item_view.js

@@ -75,7 +75,6 @@
       this.timeStampView.setElement(this.$('.last-timestamp'));
       this.timeStampView.update();
 
-      emoji_util.parse(this.$('.name'));
 
       if (lastMessage) {
         if (this.bodyView) {

js/views/conversation_view.js

@@ -177,7 +177,6 @@
         model: this.model,
       });
 
-      emoji_util.parse(this.$('.conversation-name'));
 
       this.window = options.window;
       this.fileInput = new Whisper.FileInputView({
@@ -1331,7 +1330,7 @@
       }
 
       const input = this.$messageField;
-      const message = this.replace_colons(input.val()).trim();
+      const message = window.Signal.Emoji.replaceColons(input.val()).trim();
 
       try {
         if (!message.length && !this.fileInput.hasFiles()) {

js/views/message_view.js

@@ -408,7 +408,6 @@
         this.$el.addClass('control');
         const content = this.$('.content');
         content.text(this.model.getDescription());
-        emoji_util.parse(content);
       } else {
         this.$el.removeClass('control');
       }

preload.js

@@ -91,7 +91,6 @@ const { autoOrientImage } = require('./js/modules/auto_orient_image');
 
 window.autoOrientImage = autoOrientImage;
 window.dataURLToBlobSync = require('blueimp-canvas-to-blob');
-window.EmojiConvertor = require('emoji-js');
 window.emojiData = require('emoji-datasource');
 window.EmojiPanel = require('emoji-panel');
 window.filesize = require('filesize');

styleguide.config.js

@@ -124,9 +124,6 @@ module.exports = {
         {
           src: 'js/conversation_controller.js',
         },
-        {
-          src: 'js/emoji_util.js',
-        },
         // Select Backbone views
         {
           src: 'js/views/react_wrapper_view.js',

test/index.html

@@ -592,7 +592,6 @@ <h3>{{ message }}</h3>
   <script type="text/javascript" src="../js/models/conversations.js" data-cover></script>
   <script type="text/javascript" src="../js/models/blockedNumbers.js" data-cover></script>
   <script type="text/javascript" src="../js/conversation_controller.js" data-cover></script>
-  <script type='text/javascript' src='../js/emoji_util.js' data-cover></script>
   <script type="text/javascript" src="../js/keychange_listener.js" data-cover></script>
   <script type='text/javascript' src='../js/expiring_messages.js' data-cover></script>
   <script type='text/javascript' src='../js/notifications.js' data-cover></script>
@@ -654,7 +653,6 @@ <h3>{{ message }}</h3>
   <script type="text/javascript" src="conversation_controller_test.js"></script>
   <script type="text/javascript" src="storage_test.js"></script>
   <script type="text/javascript" src="keychange_listener_test.js"></script>
-  <script type="text/javascript" src="emoji_util_test.js"></script>
   <script type="text/javascript" src="reliable_trigger_test.js"></script>
   <script type="text/javascript" src="backup_test.js"></script>
   <script type="text/javascript" src="crypto_test.js"></script>

test/styleguide/legacy_bridge.js

@@ -63,14 +63,6 @@ window.Signal.Migrations = {
 
 window.Signal.Components = {};
 
-window.EmojiConvertor = function EmojiConvertor() {};
-window.EmojiConvertor.prototype.init_colons = () => {};
-window.EmojiConvertor.prototype.signalReplace = html => html;
-window.EmojiConvertor.prototype.replace_unified = string => string;
-window.EmojiConvertor.prototype.img_sets = {
-  apple: {},
-};
-
 window.i18n = () => '';
 
 // Ideally we don't need to add things here. We want to add them in StyleGuideUtil, which