Revert "Don't use emoji png from internet"

This reverts commit 7483ad2. The emoji png is too large and increases our binary size a lot.
yue · Dec 25, 2018 · 8c26a87 · 8c26a87
1 parent 931499f
commit 8c26a87
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/lib/view/chat-box.js b/lib/view/chat-box.js
@@ -356,16 +356,11 @@ handlebars.registerHelper('fontStyle', function() {
   return fontStyle
 })
 
-// Path to the emoji png.
-const emojiPng = fs.realpathSync(path.resolve(__dirname, 'chat', 'sheet_apple_64_indexed_256.png'))
-
 // Register wey:// protocol to work around CROS problem with file:// protocol.
 gui.Browser.registerProtocol('wey', (u) => {
   const r = url.parse(u)
   if (r.host !== 'file')
     return gui.ProtocolStringJob.create('text/plain', 'Unsupported type')
-  if (r.path == '/emoji.png')
-    return gui.ProtocolFileJob.create(emojiPng)
   const query = querystring.parse(r.query)
   return gui.ProtocolFileJob.create(query.path)
 })

diff --git a/lib/view/chat/page.html b/lib/view/chat/page.html
@@ -81,7 +81,7 @@
     vertical-align: middle;
   }
   .apple.emoji {
-    background-image: url(wey://file/emoji.png);
+    background-image: url(https://a.slack-edge.com/c00d19/img/emoji_2017_12_06/sheet_apple_64_indexed_256.png);
     background-size: 5200% 5200%;
   }
   .custom.emoji {

diff --git a/lib/view/chat/sheet_apple_64_indexed_256.png b/lib/view/chat/sheet_apple_64_indexed_256.png